Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use katie_setup_target() so that exec.sh script is used to execute the tools when building tests

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-12-15 22:58:24 +00:00
parent a27b94b0bd
commit 99f1b37600
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmake/modules/KatieBuildMacros.cmake
View file

@ -163,7 +163,7 @@ function(KATIE_SETUP_TARGET FORTARGET)
set(targetresources ${targetresources} ${rscout})
make_directory(${rscpath})
add_custom_command(
COMMAND ${CMAKE_BINARY_DIR}/exec.sh "${CMAKE_BINARY_DIR}/bin/${KATIE_UIC}" "${resource}" -o "${rscout}"
COMMAND "${CMAKE_BINARY_DIR}/exec.sh" "${CMAKE_BINARY_DIR}/bin/${KATIE_UIC}" "${resource}" -o "${rscout}"
DEPENDS "${KATIE_UIC}"
OUTPUT "${rscout}"
)
@ -172,7 +172,7 @@ function(KATIE_SETUP_TARGET FORTARGET)
set(targetresources ${targetresources} ${rscout})
make_directory(${rscpath})
add_custom_command(
COMMAND ${CMAKE_BINARY_DIR}/exec.sh "${CMAKE_BINARY_DIR}/bin/${KATIE_RCC}" "${resource}" -o "${rscout}" -name "${rscname}"
COMMAND "${CMAKE_BINARY_DIR}/exec.sh" "${CMAKE_BINARY_DIR}/bin/${KATIE_RCC}" "${resource}" -o "${rscout}" -name "${rscname}"
DEPENDS "${KATIE_RCC}"
OUTPUT "${rscout}"
)
@ -193,7 +193,7 @@ function(KATIE_SETUP_TARGET FORTARGET)
endforeach()
make_directory(${rscpath})
add_custom_command(
COMMAND ${CMAKE_BINARY_DIR}/exec.sh "${CMAKE_BINARY_DIR}/bin/${KATIE_MOC}" -nw "${resource}" -o "${rscout}" ${mocargs}
COMMAND "${CMAKE_BINARY_DIR}/exec.sh" "${CMAKE_BINARY_DIR}/bin/${KATIE_MOC}" -nw "${resource}" -o "${rscout}" ${mocargs}
DEPENDS "${KATIE_MOC}"
OUTPUT "${rscout}"
)
@ -206,7 +206,7 @@ function(KATIE_SETUP_TARGET FORTARGET)
set(trout "${trdir}/${trname}.qm")
add_custom_target(
${FORTARGET}_${trname} ALL
COMMAND ${CMAKE_BINARY_DIR}/exec.sh "${CMAKE_BINARY_DIR}/bin/${KATIE_LRELEASE}" "${resource}" -qm "${trout}"
COMMAND "${CMAKE_BINARY_DIR}/exec.sh" "${CMAKE_BINARY_DIR}/bin/${KATIE_LRELEASE}" "${resource}" -qm "${trout}"
DEPENDS "${KATIE_LRELEASE}"
)
set_source_files_properties(${trout} PROPERTIES GENERATED TRUE)
@ -311,9 +311,9 @@ endmacro()
# a macro to add tests easily by setting them up with the assumptions they make
macro(KATIE_TEST TESTNAME TESTSOURCES)
katie_resources(${TESTSOURCES} ${ARGN})
katie_setup_target(${TESTNAME} ${TESTSOURCES} ${ARGN})
add_executable(${TESTNAME} ${TESTSOURCES} ${ARGN})
add_executable(${TESTNAME} ${${TESTNAME}_SOURCES})
target_link_libraries(${TESTNAME} KtCore KtTest)
target_compile_definitions(