[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-125-g7160c8c

[Brad King]

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  7160c8c8dea75dda8f016823ed0a0ff2e922fdef (commit)
       via  8d01befb1cf953911e6356aee4cd7752a2a09fba (commit)
      from  9a4fa800379b26bfbae3a9a98ed94baf58166713 (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=7160c8c8dea75dda8f016823ed0a0ff2e922fdef
commit 7160c8c8dea75dda8f016823ed0a0ff2e922fdef
Merge: 9a4fa80 8d01bef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 8 12:37:34 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 8 12:37:34 2016 -0400

    Merge topic 'cmake-gui-osx-launch' into next
    
    8d01befb cmake-gui: Fix `cmake-gui` command-line launch on OS X with Qt 5


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d01befb1cf953911e6356aee4cd7752a2a09fba
commit 8d01befb1cf953911e6356aee4cd7752a2a09fba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 8 12:30:48 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 8 12:30:48 2016 -0400

    cmake-gui: Fix `cmake-gui` command-line launch on OS X with Qt 5
    
    Qt 5 cannot find its plugins when `MacOS/CMake` is launched through
    a `bin/cmake-gui` symbolic link.  Use a launcher script instead.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index a906f4a..01efd55 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -210,10 +210,9 @@ if(UNIX AND NOT APPLE)
 endif()
 
 if(APPLE)
-  install(CODE "
-    execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
-        WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
-  " ${COMPONENT})
+  install(PROGRAMS cmake-gui.bash RENAME cmake-gui
+    DESTINATION bin
+    ${COMPONENT})
 endif()
 
 if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
diff --git a/Source/QtDialog/cmake-gui.bash b/Source/QtDialog/cmake-gui.bash
new file mode 100755
index 0000000..492a5d0
--- /dev/null
+++ b/Source/QtDialog/cmake-gui.bash
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exec "${BASH_SOURCE%/*}/../MacOS/CMake" "$@"

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

Summary of changes:
 Source/QtDialog/CMakeLists.txt |    7 +++----
 Source/QtDialog/cmake-gui.bash |    2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100755 Source/QtDialog/cmake-gui.bash


hooks/post-receive
-- 
CMake