summaryrefslogtreecommitdiffstats
path: root/Source/QtDialog
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-06-24 12:55:29 (GMT)
committerBrad King <brad.king@kitware.com>2015-06-24 12:57:50 (GMT)
commitd2cf92ec26602f47f44ce5e043ac7e1b3f96a1a5 (patch)
treed97d46661c7993450681afcf4aabf1aaf6867f69 /Source/QtDialog
parentd9b974b18ebad4bd84f40e7cebe01725f081bd5e (diff)
downloadCMake-d2cf92ec26602f47f44ce5e043ac7e1b3f96a1a5.zip
CMake-d2cf92ec26602f47f44ce5e043ac7e1b3f96a1a5.tar.gz
CMake-d2cf92ec26602f47f44ce5e043ac7e1b3f96a1a5.tar.bz2
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.
Diffstat (limited to 'Source/QtDialog')
-rw-r--r--Source/QtDialog/CMakeSetup.cxx2
-rw-r--r--Source/QtDialog/CMakeSetupDialog.cxx2
2 files changed, 2 insertions, 2 deletions
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"