mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-28 09:58:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmake-gui: Restore application icon on macOS

Browse Source 
In commit 41e223deb3 (CMake GUI: Split up into libraries, add test shim,
2020-09-14) the macOS icon source file was moved to CMakeGUILib, but it
needs to be directly in the main application in order to be attached to
the `.app` in the right place.
This commit is contained in:
Brad King
2020-10-13 10:35:14 -04:00
parent 33ad20b8f9
commit efe48189bf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/QtDialog/CMakeLists.txt
View File

@@ -144,12 +144,6 @@ endif ()
if(WIN32) if(WIN32)
list(APPEND SRCS CMakeSetup.rc) list(APPEND SRCS CMakeSetup.rc)
endif() 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) if(USE_LGPL)
install(FILES ${CMake_SOURCE_DIR}/Licenses/LGPLv${USE_LGPL}.txt install(FILES ${CMake_SOURCE_DIR}/Licenses/LGPLv${USE_LGPL}.txt
@@ -174,6 +168,12 @@ target_link_libraries(cmake-gui CMakeGUIMainLib Qt5::Core)
if(WIN32) if(WIN32)
target_sources(CMakeGUILib INTERFACE $<TARGET_OBJECTS:CMakeVersion>) target_sources(CMakeGUILib INTERFACE $<TARGET_OBJECTS:CMakeVersion>)
endif() 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) if(CMake_JOB_POOL_LINK_BIN)
set_property(TARGET cmake-gui PROPERTY JOB_POOL_LINK "link-bin") set_property(TARGET cmake-gui PROPERTY JOB_POOL_LINK "link-bin")