summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2018-07-06 11:28:20 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-07-06 23:50:37 +0200
commit8b2eec785b3a4b56f8807f60f5b5615bbacc6b2e (patch)
treebeeb09185a41dc7910c04597c2ba0201d84b1ce0
parent7e03bde7becc52bd11c27702e7826702ea01a73f (diff)
downloadkube-8b2eec785b3a4b56f8807f60f5b5615bbacc6b2e.tar.gz
kube-8b2eec785b3a4b56f8807f60f5b5615bbacc6b2e.zip
Try harder to always rebuild the resource
-rw-r--r--icons/breeze/CMakeLists.txt12
1 files 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)
13 13
14 get_target_property(QT_RCC_EXECUTABLE Qt5::rcc LOCATION) 14 get_target_property(QT_RCC_EXECUTABLE Qt5::rcc LOCATION)
15 15
16 file(REMOVE ${BINARY_RESOURCE_FILE})
16 file(REMOVE_RECURSE ${RESOURCES_WORKING_DIR}) 17 file(REMOVE_RECURSE ${RESOURCES_WORKING_DIR})
17 file(MAKE_DIRECTORY ${RESOURCES_WORKING_DIR}) 18 file(MAKE_DIRECTORY ${RESOURCES_WORKING_DIR})
18 #Copying symlinks doesn't work on windows if the target is not yet available. 19 #Copying symlinks doesn't work on windows if the target is not yet available.
@@ -29,20 +30,23 @@ if(BINARY_ICONS_RESOURCE)
29 ${RESOURCES_WORKING_DIR}/CMakeLists.txt 30 ${RESOURCES_WORKING_DIR}/CMakeLists.txt
30 ) 31 )
31 32
32 add_custom_command(OUTPUT ${RESOURCE_FILE} 33 add_custom_command(OUTPUT ${RESOURCE_FILE} always_rebuild1
33 COMMAND ${QT_RCC_EXECUTABLE} --project -o ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc 34 COMMAND ${QT_RCC_EXECUTABLE} --project -o ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc
34 COMMAND $<TARGET_FILE:qrcAlias> -i ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -o ${RESOURCE_FILE} 35 COMMAND $<TARGET_FILE:qrcAlias> -i ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -o ${RESOURCE_FILE}
36 DEPENDS ${RESOURCES_WORKING_DIR}
35 WORKING_DIRECTORY ${RESOURCES_WORKING_DIR} 37 WORKING_DIRECTORY ${RESOURCES_WORKING_DIR}
38 COMMENT "Generating ${RESOURCE_FILE}"
36 ) 39 )
37 add_custom_command(OUTPUT ${BINARY_RESOURCE_FILE} 40 add_custom_command(OUTPUT ${BINARY_RESOURCE_FILE} always_rebuild2
38 COMMAND ${QT_RCC_EXECUTABLE} --binary 41 COMMAND ${QT_RCC_EXECUTABLE} --binary
39 -o ${BINARY_RESOURCE_FILE} 42 -o ${BINARY_RESOURCE_FILE}
40 ${RESOURCE_FILE} 43 ${RESOURCE_FILE}
41 DEPENDS ${RESOURCE_FILE} 44 DEPENDS ${RESOURCE_FILE} always_rebuild1
42 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 45 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
46 COMMENT "Generating ${BINARY_RESOURCE_FILE}"
43 ) 47 )
44 48
45 add_custom_target(kube-${target}-rcc ALL DEPENDS ${BINARY_RESOURCE_FILE}) 49 add_custom_target(kube-${target}-rcc ALL DEPENDS ${BINARY_RESOURCE_FILE} always_rebuild2)
46 50
47 set(${outfile} ${BINARY_RESOURCE_FILE} PARENT_SCOPE) 51 set(${outfile} ${BINARY_RESOURCE_FILE} PARENT_SCOPE)
48 endfunction() 52 endfunction()