From 4ba3bee1e22eb23e714bbbada41bc7bb149f3078 Mon Sep 17 00:00:00 2001 From: EndrII Date: Sun, 16 Oct 2022 12:28:07 +0300 Subject: [PATCH] move qmake executabe to general section --- QuasarApp.cmake | 12 +++++++++++- QuasarAppCITargets.cmake | 32 ++++++++++---------------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/QuasarApp.cmake b/QuasarApp.cmake index 2691e78..020bd58 100644 --- a/QuasarApp.cmake +++ b/QuasarApp.cmake @@ -34,9 +34,19 @@ IF(NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE Release) ENDIF(NOT CMAKE_BUILD_TYPE) +if (NOT QT_QT_ROOT) + if (QT_VERSION_MAJOR) + get_filename_component(QT_QT_ROOT "${Qt${QT_VERSION_MAJOR}Core_DIR}/../../.." ABSOLUTE) + endif() +endif() + +if (NOT QT_QMAKE_EXECUTABLE) + message(The QT_QMAKE_EXECUTABLE variable is not set. Try to Initialize from qtdir) + find_program(QT_QMAKE_EXECUTABLE qmake) +endif() + ## Default Defines ## End DEfault defines - include(${CMAKE_CURRENT_LIST_DIR}/ccache.cmake) include(${CMAKE_CURRENT_LIST_DIR}/QuasarAppCITargets.cmake) include(${CMAKE_CURRENT_LIST_DIR}/QtUtils.cmake) diff --git a/QuasarAppCITargets.cmake b/QuasarAppCITargets.cmake index f94994c..db60fc1 100644 --- a/QuasarAppCITargets.cmake +++ b/QuasarAppCITargets.cmake @@ -169,14 +169,10 @@ function(addTestsArg name testExec arg) endif (WIN32) - - find_program(Q_MAKE_EXE qmake) - - ADD_CUSTOM_TARGET( deployTest${name} - COMMAND cqtdeployer clear -bin ${EXEC_TEST} -qmake ${Q_MAKE_EXE} -targetDir ${DIR_FOR_TESTING}/${name} -libDir \"${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}\" -recursiveDepth 5 - COMMENT "Deploy Test: cqtdeployer clear -bin ${EXEC_TEST} -qmake ${Q_MAKE_EXE} -targetDir ${DIR_FOR_TESTING}/${name} -libDir ${CMAKE_SOURCE_DIR} -recursiveDepth 5" + COMMAND cqtdeployer clear -bin ${EXEC_TEST} -qmake ${QT_QMAKE_EXECUTABLE} -targetDir ${DIR_FOR_TESTING}/${name} -libDir \"${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}\" -recursiveDepth 5 + COMMENT "Deploy Test: cqtdeployer clear -bin ${EXEC_TEST} -qmake ${QT_QMAKE_EXECUTABLE} -targetDir ${DIR_FOR_TESTING}/${name} -libDir ${CMAKE_SOURCE_DIR} -recursiveDepth 5" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) @@ -209,12 +205,10 @@ function(addTests name testExec) endif (WIN32) - find_program(Q_MAKE_EXE qmake) - ADD_CUSTOM_TARGET( deployTest${name} - COMMAND cqtdeployer clear -bin ${EXEC_TEST} -qmake ${Q_MAKE_EXE} -targetDir ${DIR_FOR_TESTING}/${name} -libDir \"${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}\" -recursiveDepth 5 - COMMENT "Deploy Test: cqtdeployer clear -bin ${EXEC_TEST} -qmake ${Q_MAKE_EXE} -targetDir ${DIR_FOR_TESTING}/${name} -libDir ${CMAKE_SOURCE_DIR} -recursiveDepth 5" + COMMAND cqtdeployer clear -bin ${EXEC_TEST} -qmake ${QT_QMAKE_EXECUTABLE} -targetDir ${DIR_FOR_TESTING}/${name} -libDir \"${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}\" -recursiveDepth 5 + COMMENT "Deploy Test: cqtdeployer clear -bin ${EXEC_TEST} -qmake ${QT_QMAKE_EXECUTABLE} -targetDir ${DIR_FOR_TESTING}/${name} -libDir ${CMAKE_SOURCE_DIR} -recursiveDepth 5" ) @@ -260,12 +254,10 @@ function(addDeploy name targets targetDir) endif(TARGET deploy${name}) - find_program(Q_MAKE_EXE qmake) - ADD_CUSTOM_TARGET( deploy${name} - COMMAND cqtdeployer clear -binPrefix \"${CMAKE_BINARY_DIR}\" -bin ${targets} -qmake ${Q_MAKE_EXE} -targetDir ${targetDir} -libDir \"${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}\" -recursiveDepth 5 - COMMENT "Deploy: cqtdeployer clear -binPrefix \"${CMAKE_BINARY_DIR}\" -bin ${targets} -qmake ${Q_MAKE_EXE} -targetDir ${targetDir} -libDir ${CMAKE_SOURCE_DIR} -recursiveDepth 5" + COMMAND cqtdeployer clear -binPrefix \"${CMAKE_BINARY_DIR}\" -bin ${targets} -qmake ${QT_QMAKE_EXECUTABLE} -targetDir ${targetDir} -libDir \"${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}\" -recursiveDepth 5 + COMMENT "Deploy: cqtdeployer clear -binPrefix \"${CMAKE_BINARY_DIR}\" -bin ${targets} -qmake ${QT_QMAKE_EXECUTABLE} -targetDir ${targetDir} -libDir ${CMAKE_SOURCE_DIR} -recursiveDepth 5" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) @@ -281,12 +273,10 @@ function(addDeployFromFile name) endif(TARGET deploy${name}) - find_program(Q_MAKE_EXE qmake) - ADD_CUSTOM_TARGET( deploy${name} - COMMAND cqtdeployer -qmake ${Q_MAKE_EXE} -binPrefix \"${CMAKE_BINARY_DIR}\" -libDir \"${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}\" - COMMENT "Deploy: cqtdeployer -qmake ${Q_MAKE_EXE} -binPrefix \"${CMAKE_BINARY_DIR}\" -libDir ${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}" + COMMAND cqtdeployer -qmake ${QT_QMAKE_EXECUTABLE} -binPrefix \"${CMAKE_BINARY_DIR}\" -libDir \"${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}\" + COMMENT "Deploy: cqtdeployer -qmake ${QT_QMAKE_EXECUTABLE} -binPrefix \"${CMAKE_BINARY_DIR}\" -libDir ${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) add_dependencies(deploy deploy${name}) @@ -302,8 +292,6 @@ function(addDeployFromCustomFile name file) endif(TARGET deploy${name}) - find_program(Q_MAKE_EXE qmake) - file(GLOB ${name}files "${file}*" ) @@ -311,8 +299,8 @@ function(addDeployFromCustomFile name file) ADD_CUSTOM_TARGET( deploy${name} SOURCES ${${name}files} - COMMAND cqtdeployer -qmake ${Q_MAKE_EXE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file} -libDir \"${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}\" - COMMENT "Deploy: cqtdeployer -qmake ${Q_MAKE_EXE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file} -libDir ${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}" + COMMAND cqtdeployer -qmake ${QT_QMAKE_EXECUTABLE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file} -libDir \"${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}\" + COMMENT "Deploy: cqtdeployer -qmake ${QT_QMAKE_EXECUTABLE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file} -libDir ${CMAKE_SOURCE_DIR},${CMAKE_BINARY_DIR}" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} )