From 29877034556b91a7289811b0738759a659f5f831 Mon Sep 17 00:00:00 2001 From: EndrII Date: Fri, 2 Aug 2024 14:04:56 +0200 Subject: [PATCH 1/3] added validation for no qt projects --- QuasarAppCITargets.cmake | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/QuasarAppCITargets.cmake b/QuasarAppCITargets.cmake index e931ace..4c7b146 100644 --- a/QuasarAppCITargets.cmake +++ b/QuasarAppCITargets.cmake @@ -300,13 +300,24 @@ function(addDeployFromCustomFile name file) "${file}*" ) - ADD_CUSTOM_TARGET( - deploy${name} - SOURCES ${${name}files} - COMMAND cqtdeployer -qmake ${QT_QMAKE_EXECUTABLE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file} - COMMENT "Deploy: cqtdeployer -qmake ${QT_QMAKE_EXECUTABLE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file}" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) + if (QT_QMAKE_EXECUTABLE) + ADD_CUSTOM_TARGET( + deploy${name} + SOURCES ${${name}files} + COMMAND cqtdeployer -qmake ${QT_QMAKE_EXECUTABLE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file} + COMMENT "Deploy: cqtdeployer -qmake ${QT_QMAKE_EXECUTABLE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file}" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + elseif() + ADD_CUSTOM_TARGET( + deploy${name} + SOURCES ${${name}files} + COMMAND cqtdeployer noQt -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file} + COMMENT "Deploy: cqtdeployer -qmake ${QT_QMAKE_EXECUTABLE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file}" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + endif() + add_dependencies(deploy deploy${name}) From 54881daa9ffa0dcc6d9a5366e557d2e238286d98 Mon Sep 17 00:00:00 2001 From: EndrII Date: Fri, 2 Aug 2024 14:20:23 +0200 Subject: [PATCH 2/3] fix typo error --- QuasarAppCITargets.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QuasarAppCITargets.cmake b/QuasarAppCITargets.cmake index 4c7b146..de6917d 100644 --- a/QuasarAppCITargets.cmake +++ b/QuasarAppCITargets.cmake @@ -308,7 +308,7 @@ function(addDeployFromCustomFile name file) COMMENT "Deploy: cqtdeployer -qmake ${QT_QMAKE_EXECUTABLE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file}" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) - elseif() + else() ADD_CUSTOM_TARGET( deploy${name} SOURCES ${${name}files} From d0a5fb7d39ac2d04b878f088e107d3f1f7d55b78 Mon Sep 17 00:00:00 2001 From: EndrII Date: Fri, 2 Aug 2024 14:26:11 +0200 Subject: [PATCH 3/3] fix coment --- QuasarAppCITargets.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QuasarAppCITargets.cmake b/QuasarAppCITargets.cmake index de6917d..f63a8eb 100644 --- a/QuasarAppCITargets.cmake +++ b/QuasarAppCITargets.cmake @@ -313,7 +313,7 @@ function(addDeployFromCustomFile name file) deploy${name} SOURCES ${${name}files} COMMAND cqtdeployer noQt -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file} - COMMENT "Deploy: cqtdeployer -qmake ${QT_QMAKE_EXECUTABLE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file}" + COMMENT "Deploy: cqtdeployer noQt -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file}" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) endif()