diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-13 15:10:18 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-13 11:10:25 -0400 |
| commit | f04bad909111201f20fd893a09976a0d13af6afa (patch) | |
| tree | 629300598fc2dbdceaca91356e7be8998d09d745 | |
| parent | 33ad20b8f9338bd374e314d8af847ca6ef4a8453 (diff) | |
| parent | efe48189bfced062165feedec15a1d7be1306eb4 (diff) | |
| download | cmake-f04bad909111201f20fd893a09976a0d13af6afa.tar.gz | |
Merge topic 'cmake-gui-macos-icon' into release-3.19
efe48189bf cmake-gui: Restore application icon on macOS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5361
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 394762a866..d6ae03b235 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -144,12 +144,6 @@ endif () if(WIN32) list(APPEND SRCS CMakeSetup.rc) endif() -if(APPLE) - list(APPEND SRCS CMakeSetup.icns) - set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns) - set_source_files_properties(CMakeSetup.icns PROPERTIES - MACOSX_PACKAGE_LOCATION Resources) -endif() if(USE_LGPL) install(FILES ${CMake_SOURCE_DIR}/Licenses/LGPLv${USE_LGPL}.txt @@ -174,6 +168,12 @@ target_link_libraries(cmake-gui CMakeGUIMainLib Qt5::Core) if(WIN32) target_sources(CMakeGUILib INTERFACE $<TARGET_OBJECTS:CMakeVersion>) endif() +if(APPLE) + target_sources(CMakeGUILib INTERFACE CMakeSetup.icns) + set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns) + set_source_files_properties(CMakeSetup.icns PROPERTIES + MACOSX_PACKAGE_LOCATION Resources) +endif() if(CMake_JOB_POOL_LINK_BIN) set_property(TARGET cmake-gui PROPERTY JOB_POOL_LINK "link-bin") |