[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-640-g6edc86f

[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  6edc86ff309de6a2322ec201d6f833159ad408b6 (commit)
       via  d2cf92ec26602f47f44ce5e043ac7e1b3f96a1a5 (commit)
      from  d50bb530ba4db134a0674a17908bcda9ab5d1537 (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=6edc86ff309de6a2322ec201d6f833159ad408b6
commit 6edc86ff309de6a2322ec201d6f833159ad408b6
Merge: d50bb53 d2cf92e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 24 09:10:15 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 24 09:10:15 2015 -0400

    Merge topic 'cmake-gui-osx-install-command-line' into next
    
    d2cf92ec cmake-gui: Change --install to use /usr/local/bin by default (#15627)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2cf92ec26602f47f44ce5e043ac7e1b3f96a1a5
commit d2cf92ec26602f47f44ce5e043ac7e1b3f96a1a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 24 08:55:29 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 24 08:57:50 2015 -0400

    cmake-gui: Change --install to use /usr/local/bin by default (#15627)
    
    In commit v3.3.0-rc1~49^2~2 (cmake-gui: Add --install option to add
    command-line tools on OS X, 2015-05-19) the option default was set to
    /usr/bin because that is where the old command line install dialog
    placed the symlinks.  A better default is /usr/local/bin because it is
    meant for locally installed software rather than Apple-installed tools.
    Also, as of OS X El Capitan, special privileges are required even for
    root to modify /usr/bin but not /usr/local/bin.

diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 2d336ee..8094124 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -84,7 +84,7 @@ int main(int argc, char** argv)
 #if defined(Q_OS_MAC)
   if (argc2 == 2 && strcmp(argv2[1], "--install") == 0)
     {
-    return cmOSXInstall("/usr/bin");
+    return cmOSXInstall("/usr/local/bin");
     }
   if (argc2 == 2 && cmHasLiteralPrefix(argv2[1], "--install="))
     {
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index bc783a3..03417f3 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -425,7 +425,7 @@ void CMakeSetupDialog::doInstallForCommandLine()
     "\n"
     " PATH=\"%1\":\"$PATH\"\n"
     "\n"
-    "Or, to install symlinks to '/usr/bin', run:\n"
+    "Or, to install symlinks to '/usr/local/bin', run:\n"
     "\n"
     " sudo \"%2\" --install\n"
     "\n"

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

Summary of changes:
 Source/QtDialog/CMakeSetup.cxx       |    2 +-
 Source/QtDialog/CMakeSetupDialog.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake