diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-25 14:39:19 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-25 14:39:19 (GMT) |
| commit | bd5bf762c821ca6175095cdabb46237afb6aa3fa (patch) | |
| tree | e7ce2f8ede37d5ef30493ad5fedbfa7c84a8ae99 /Source | |
| parent | 2d14021a850376be3b57145dfbfda8c57f5fffea (diff) | |
| parent | d2cf92ec26602f47f44ce5e043ac7e1b3f96a1a5 (diff) | |
| download | CMake-bd5bf762c821ca6175095cdabb46237afb6aa3fa.zip CMake-bd5bf762c821ca6175095cdabb46237afb6aa3fa.tar.gz CMake-bd5bf762c821ca6175095cdabb46237afb6aa3fa.tar.bz2 | |
Merge topic 'cmake-gui-osx-install-command-line'
d2cf92ec cmake-gui: Change --install to use /usr/local/bin by default (#15627)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/QtDialog/CMakeSetup.cxx | 2 | ||||
| -rw-r--r-- | Source/QtDialog/CMakeSetupDialog.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 38d6d44..4f93a77 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -86,7 +86,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" |