diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-30 18:11:56 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-10-30 18:11:56 (GMT) |
| commit | b233a09f6e9bed46b65079a2d78d865b816b79c7 (patch) | |
| tree | fbfc97d2cce369d0309638bf644f518e901eb368 | |
| parent | 927b59403fe522d02308c7c5cc14d0c9d14f5b21 (diff) | |
| parent | fb13502fca5a344dd35be6fc919ae7e89ce9c6ea (diff) | |
| download | CMake-b233a09f6e9bed46b65079a2d78d865b816b79c7.zip CMake-b233a09f6e9bed46b65079a2d78d865b816b79c7.tar.gz CMake-b233a09f6e9bed46b65079a2d78d865b816b79c7.tar.bz2 | |
Merge topic 'unix-icon-install'
fb13502f QtDialog: install the 128x128 icon
fcb4541a QtDialog: don't install desktop file bits on Apple
| -rw-r--r-- | Source/QtDialog/CMake.desktop | 2 | ||||
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop index 7be495f..842091f 100644 --- a/Source/QtDialog/CMake.desktop +++ b/Source/QtDialog/CMake.desktop @@ -3,7 +3,7 @@ Version=1.0 Name=CMake Comment=Cross-platform buildsystem Exec=cmake-gui %f -Icon=CMakeSetup32 +Icon=CMakeSetup Terminal=false X-MultipleArgs=false Type=Application diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 03c2fb4..b59af94 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -171,11 +171,17 @@ set(CMAKE_INSTALL_DESTINATION_ARGS install(TARGETS cmake-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS}) -if(UNIX) +if(UNIX AND NOT APPLE) + foreach (size IN ITEMS 32 128) + install( + FILES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetup${size}.png" + DESTINATION "share/icons/hicolor/${size}x${size}/apps" + RENAME "CMakeSetup.png") + endforeach () + # install a desktop file so CMake appears in the application start menu # with an icon install(FILES CMake.desktop DESTINATION share/applications ) - install(FILES CMakeSetup32.png DESTINATION share/pixmaps ) install(FILES cmakecache.xml DESTINATION share/mime/packages ) endif() |