[Cmake-commits] CMake branch, next, updated. v3.8.0-801-g23e99f9

Kitware Robot kwrobot at kitware.com
Tue Apr 18 13:55:02 EDT 2017


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  23e99f9b65eb8fdf8bbd117117199f427a53da33 (commit)
       via  86787633f8440fcb3bd3fd96018134a6c5157e9c (commit)
      from  1050f57b74f42a921ac37180c11529bc55cfa7d3 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23e99f9b65eb8fdf8bbd117117199f427a53da33
commit 23e99f9b65eb8fdf8bbd117117199f427a53da33
Merge: 1050f57 8678763
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 18 17:46:38 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 18 13:46:40 2017 -0400

    Stage topic 'cmake-gui-desktop-icon-wayland'
    
    Topic-id: 23727
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/715


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86787633f8440fcb3bd3fd96018134a6c5157e9c
commit 86787633f8440fcb3bd3fd96018134a6c5157e9c
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Apr 17 16:44:06 2017 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Apr 17 16:48:25 2017 -0600

    cmake-gui:  Fix display of icon under Wayland.
    
    Fixes: #16797

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 10fd718..2e11a8a 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -198,7 +198,7 @@ if(UNIX AND NOT APPLE)
 
   # install a desktop file so CMake appears in the application start menu
   # with an icon
-  install(FILES CMake.desktop
+  install(FILES cmake-gui.desktop
     DESTINATION "${CMAKE_XDGDATA_DIR}/applications"
     ${COMPONENT})
   install(FILES cmakecache.xml
diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/cmake-gui.desktop
similarity index 100%
rename from Source/QtDialog/CMake.desktop
rename to Source/QtDialog/cmake-gui.desktop

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

Summary of changes:
 Source/QtDialog/CMakeLists.txt                       |    2 +-
 Source/QtDialog/{CMake.desktop => cmake-gui.desktop} |    0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Source/QtDialog/{CMake.desktop => cmake-gui.desktop} (100%)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list