[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-141-g19eb5fe

[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  19eb5feb9d2e7e3b33b3402b1e5fb0c80560e647 (commit)
       via  eafbc7f85efac1598c8a738366a5596cfdf4a981 (commit)
      from  6455c5c0afeba7e9f7f5ecc8f04b25f1462157f8 (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=19eb5feb9d2e7e3b33b3402b1e5fb0c80560e647
commit 19eb5feb9d2e7e3b33b3402b1e5fb0c80560e647
Merge: 6455c5c eafbc7f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 8 14:03:23 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 8 14:03:23 2016 -0400

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


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

    Revert "cmake-gui: Fix `cmake-gui` command-line launch on OS X with Qt 5"
    
    This reverts commit 8d01befb1cf953911e6356aee4cd7752a2a09fba.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 01efd55..a906f4a 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -210,9 +210,10 @@ if(UNIX AND NOT APPLE)
 endif()
 
 if(APPLE)
-  install(PROGRAMS cmake-gui.bash RENAME cmake-gui
-    DESTINATION bin
-    ${COMPONENT})
+  install(CODE "
+    execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
+        WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/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
deleted file mode 100755
index 492a5d0..0000000
--- a/Source/QtDialog/cmake-gui.bash
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/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, 4 insertions(+), 5 deletions(-)
 delete mode 100755 Source/QtDialog/cmake-gui.bash


hooks/post-receive
-- 
CMake