From 8b2eec785b3a4b56f8807f60f5b5615bbacc6b2e Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 6 Jul 2018 11:28:20 +0200 Subject: Try harder to always rebuild the resource --- icons/breeze/CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/icons/breeze/CMakeLists.txt b/icons/breeze/CMakeLists.txt index 0aab6254..aa2d5298 100644 --- a/icons/breeze/CMakeLists.txt +++ b/icons/breeze/CMakeLists.txt @@ -13,6 +13,7 @@ if(BINARY_ICONS_RESOURCE) get_target_property(QT_RCC_EXECUTABLE Qt5::rcc LOCATION) + file(REMOVE ${BINARY_RESOURCE_FILE}) file(REMOVE_RECURSE ${RESOURCES_WORKING_DIR}) file(MAKE_DIRECTORY ${RESOURCES_WORKING_DIR}) #Copying symlinks doesn't work on windows if the target is not yet available. @@ -29,20 +30,23 @@ if(BINARY_ICONS_RESOURCE) ${RESOURCES_WORKING_DIR}/CMakeLists.txt ) - add_custom_command(OUTPUT ${RESOURCE_FILE} + add_custom_command(OUTPUT ${RESOURCE_FILE} always_rebuild1 COMMAND ${QT_RCC_EXECUTABLE} --project -o ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc COMMAND $ -i ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -o ${RESOURCE_FILE} + DEPENDS ${RESOURCES_WORKING_DIR} WORKING_DIRECTORY ${RESOURCES_WORKING_DIR} + COMMENT "Generating ${RESOURCE_FILE}" ) - add_custom_command(OUTPUT ${BINARY_RESOURCE_FILE} + add_custom_command(OUTPUT ${BINARY_RESOURCE_FILE} always_rebuild2 COMMAND ${QT_RCC_EXECUTABLE} --binary -o ${BINARY_RESOURCE_FILE} ${RESOURCE_FILE} - DEPENDS ${RESOURCE_FILE} + DEPENDS ${RESOURCE_FILE} always_rebuild1 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Generating ${BINARY_RESOURCE_FILE}" ) - add_custom_target(kube-${target}-rcc ALL DEPENDS ${BINARY_RESOURCE_FILE}) + add_custom_target(kube-${target}-rcc ALL DEPENDS ${BINARY_RESOURCE_FILE} always_rebuild2) set(${outfile} ${BINARY_RESOURCE_FILE} PARENT_SCOPE) endfunction() -- cgit v1.2.3