From af15a631fd99819dd347a5f33a895c1c7e7a101c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 16 Dec 2019 23:50:55 +0000 Subject: [PATCH] fix build when tools are suffixed Signed-off-by: Ivailo Monev --- cmake/modules/KatieBuildMacros.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake index 46cc882b6..62ef65b22 100644 --- a/cmake/modules/KatieBuildMacros.cmake +++ b/cmake/modules/KatieBuildMacros.cmake @@ -162,7 +162,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}${KATIE_TOOLS_SUFFIX}" "${resource}" -o "${rscout}" DEPENDS "${KATIE_UIC}" OUTPUT "${rscout}" ) @@ -171,7 +171,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}${KATIE_TOOLS_SUFFIX}" "${resource}" -o "${rscout}" -name "${rscname}" DEPENDS "${KATIE_RCC}" OUTPUT "${rscout}" ) @@ -202,7 +202,7 @@ function(KATIE_SETUP_TARGET FORTARGET) set(rscout "${CMAKE_CURRENT_BINARY_DIR}/${rscname}.qm") add_custom_target( ${FORTARGET}_${rscname} ALL - COMMAND "${CMAKE_BINARY_DIR}/exec.sh" "${CMAKE_BINARY_DIR}/bin/${KATIE_LRELEASE}" "${resource}" -qm "${rscout}" + COMMAND "${CMAKE_BINARY_DIR}/exec.sh" "${CMAKE_BINARY_DIR}/bin/${KATIE_LRELEASE}${KATIE_TOOLS_SUFFIX}" "${resource}" -qm "${rscout}" DEPENDS "${KATIE_LRELEASE}" ) set_source_files_properties(${rscout} PROPERTIES GENERATED TRUE) -- 2.11.0