mirror of
https://github.com/QuasarApp/CMake.git
synced 2025-04-27 10:14:40 +00:00
fx pathes
This commit is contained in:
parent
74f0514752
commit
10558505b6
@ -133,15 +133,11 @@ function(addTestsArg name testExec arg)
|
||||
return()
|
||||
endif(TARGET test${name})
|
||||
|
||||
if (${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
||||
set(RUNTIME_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/)
|
||||
endif()
|
||||
|
||||
set(EXEC_TEST ${RUNTIME_DIR}${testExec})
|
||||
set(EXEC_TEST ${CMAKE_BINARY_DIR}${testExec})
|
||||
set(RUN_CMD ${DIR_FOR_TESTING}/${name}/${testExec}.sh)
|
||||
|
||||
if (WIN32)
|
||||
set(EXEC_TEST ${RUNTIME_DIR}${testExec}.exe)
|
||||
set(EXEC_TEST ${CMAKE_BINARY_DIR}${testExec}.exe)
|
||||
set(RUN_CMD ${DIR_FOR_TESTING}/${name}/${testExec}.exe)
|
||||
|
||||
endif (WIN32)
|
||||
@ -177,15 +173,11 @@ function(addTests name testExec)
|
||||
|
||||
endif(TARGET test${name})
|
||||
|
||||
if (${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
||||
set(RUNTIME_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/)
|
||||
endif()
|
||||
|
||||
set(EXEC_TEST ${RUNTIME_DIR}${testExec})
|
||||
set(EXEC_TEST ${CMAKE_BINARY_DIR}${testExec})
|
||||
set(RUN_CMD ${DIR_FOR_TESTING}/${name}/${testExec}.sh)
|
||||
|
||||
if (WIN32)
|
||||
set(EXEC_TEST ${RUNTIME_DIR}${testExec}.exe)
|
||||
set(EXEC_TEST ${CMAKE_BINARY_DIR}${testExec}.exe)
|
||||
set(RUN_CMD ${DIR_FOR_TESTING}/${name}/${testExec}.exe)
|
||||
|
||||
endif (WIN32)
|
||||
@ -243,14 +235,10 @@ function(addDeploy name targets targetDir)
|
||||
|
||||
find_program(Q_MAKE_EXE qmake)
|
||||
|
||||
if (${CMAKE_BINARY_DIR})
|
||||
set(RUNTIME_DIR ${CMAKE_BINARY_DIR}/)
|
||||
endif()
|
||||
|
||||
ADD_CUSTOM_TARGET(
|
||||
deploy${name}
|
||||
COMMAND cqtdeployer clear -binPrefix \"${RUNTIME_DIR}\" -bin ${targets} -qmake ${Q_MAKE_EXE} -targetDir ${targetDir} -libDir ${CMAKE_SOURCE_DIR} -recursiveDepth 5
|
||||
COMMENT "Deploy: cqtdeployer clear -binPrefix \"${RUNTIME_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 ${Q_MAKE_EXE} -targetDir ${targetDir} -libDir ${CMAKE_SOURCE_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"
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
)
|
||||
|
||||
@ -268,14 +256,10 @@ function(addDeployFromFile name)
|
||||
|
||||
find_program(Q_MAKE_EXE qmake)
|
||||
|
||||
if (${CMAKE_BINARY_DIR})
|
||||
set(RUNTIME_DIR ${CMAKE_BINARY_DIR}/)
|
||||
endif()
|
||||
|
||||
ADD_CUSTOM_TARGET(
|
||||
deploy${name}
|
||||
COMMAND cqtdeployer -qmake ${Q_MAKE_EXE} -binPrefix \"${RUNTIME_DIR}\" -confFile ${name}
|
||||
COMMENT "Deploy: cqtdeployer -qmake ${Q_MAKE_EXE} -binPrefix \"${RUNTIME_DIR}\" -confFile ${name}"
|
||||
COMMAND cqtdeployer -qmake ${Q_MAKE_EXE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${name}
|
||||
COMMENT "Deploy: cqtdeployer -qmake ${Q_MAKE_EXE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${name}"
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
)
|
||||
add_dependencies(deploy deploy${name})
|
||||
@ -293,14 +277,10 @@ function(addDeployFromCustomFile name file)
|
||||
|
||||
find_program(Q_MAKE_EXE qmake)
|
||||
|
||||
if (${CMAKE_BINARY_DIR})
|
||||
set(RUNTIME_DIR ${CMAKE_BINARY_DIR}/)
|
||||
endif()
|
||||
|
||||
ADD_CUSTOM_TARGET(
|
||||
deploy${name}
|
||||
COMMAND cqtdeployer -qmake ${Q_MAKE_EXE} -binPrefix \"${RUNTIME_DIR}\" -confFile ${file}
|
||||
COMMENT "Deploy: cqtdeployer -qmake ${Q_MAKE_EXE} -binPrefix \"${RUNTIME_DIR}\" -confFile ${file}"
|
||||
COMMAND cqtdeployer -qmake ${Q_MAKE_EXE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file}
|
||||
COMMENT "Deploy: cqtdeployer -qmake ${Q_MAKE_EXE} -binPrefix \"${CMAKE_BINARY_DIR}\" -confFile ${file}"
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user