[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-201-gf2efb33

[Ben Boeckel]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f2efb33191d8ff719ae004698c6b6acf2cc0492b (commit)
       via  fb13502fca5a344dd35be6fc919ae7e89ce9c6ea (commit)
       via  fcb4541a05ea068715c8815c0294d2638721b071 (commit)
      from  5fb80a3cb5df6350fe59608aa25c6e983e57123e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2efb33191d8ff719ae004698c6b6acf2cc0492b
commit f2efb33191d8ff719ae004698c6b6acf2cc0492b
Merge: 5fb80a3 fb13502
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Oct 29 11:48:23 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 29 11:48:23 2014 -0400

    Merge topic 'unix-icon-install' into next
    
    fb13502f QtDialog: install the 128x128 icon
    fcb4541a QtDialog: don't install desktop file bits on Apple


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb13502fca5a344dd35be6fc919ae7e89ce9c6ea
commit fb13502fca5a344dd35be6fc919ae7e89ce9c6ea
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Oct 29 11:39:27 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Oct 29 11:47:29 2014 -0400

    QtDialog: install the 128x128 icon
    
    Also only install the icons to the icons directory.

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 feedcc9..b59af94 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -172,10 +172,16 @@ set(CMAKE_INSTALL_DESTINATION_ARGS
 install(TARGETS cmake-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS})
 
 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()
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcb4541a05ea068715c8815c0294d2638721b071
commit fcb4541a05ea068715c8815c0294d2638721b071
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Oct 29 11:38:48 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Oct 29 11:38:48 2014 -0400

    QtDialog: don't install desktop file bits on Apple
    
    Apple uses the dmg file which doesn't have .desktop support.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 03c2fb4..feedcc9 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -171,7 +171,7 @@ set(CMAKE_INSTALL_DESTINATION_ARGS
 
 install(TARGETS cmake-gui RUNTIME DESTINATION bin ${CMAKE_INSTALL_DESTINATION_ARGS})
 
-if(UNIX)
+if(UNIX AND NOT APPLE)
   # install a desktop file so CMake appears in the application start menu
   # with an icon
   install(FILES CMake.desktop DESTINATION share/applications )

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/CMake.desktop  |    2 +-
 Source/QtDialog/CMakeLists.txt |   10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake