diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-06-03 15:10:35 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-15 10:53:32 +0000 |
commit | ad036413b1044c802253a5843568048d22523ebf (patch) | |
tree | 328f2b0faf26a0103d277630d4b5df7ed7e653fa | |
parent | 2e2f052530afedfe50ed55cef3bc3bd5b6e47f20 (diff) |
Clean up runAlways target
After refactorings this can be now simplified and fixes
windows warnings about target duplication when multi
config is used. Remove extra target and leave as command
output, which is never created.
Change-Id: I4930e9309a639e8853ba9f6c03ee51bc71ade5c6
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 4e9f6d8ae453284cdd167b69ceab0d81aafeb327)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/core/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 94df8fbe6..8dc6a8e9d 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -548,7 +548,10 @@ foreach(config ${configs}) endif() add_custom_command( - OUTPUT ${buildDir}/${config}/QtWebEngineCore.stamp ${sandboxOutput} runAlways # use generator expression in CMAKE 3.20 + OUTPUT + ${buildDir}/${config}/QtWebEngineCore.stamp + ${sandboxOutput} + ${buildDir}/${config}/runAlways # use generator expression in CMAKE 3.20 WORKING_DIRECTORY ${buildDir}/${config} COMMAND ${CMAKE_COMMAND} -E echo "Ninja ${config} build" COMMAND Ninja::ninja @@ -559,7 +562,6 @@ foreach(config ${configs}) VERBATIM COMMAND_EXPAND_LISTS ) - add_custom_target(ninja_${config} DEPENDS ${buildDir}/${config}/QtWebEngineCore.stamp ${sandboxOutput} runAlways) endforeach() ## @@ -603,7 +605,7 @@ foreach(config ${configs}) set_property(TARGET WebEngineCoreSandbox PROPERTY IMPORTED_LOCATION_${cfg} ${sandboxLibraryPath}) set_source_files_properties(${sandboxLibraryPath} PROPERTIES GENERATED TRUE) - add_custom_command(OUTPUT ${sandboxLibraryPath} DEPENDS ninja_${config}) + add_custom_command(OUTPUT ${sandboxLibraryPath} DEPENDS ${sandboxOutput}) add_custom_target(generate_sandbox_${cfg} DEPENDS ${sandboxLibraryPath}) endif() |