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
This commit is contained in:
Brad King
2020-10-13 15:10:18 +00:00
committed by Kitware Robot

View File

@@ -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")