Merge branch 'cmake-gui-osx-install-command-line' into release

This commit is contained in:
Brad King 2015-06-24 09:10:31 -04:00
commit b01b0d74f2
2 changed files with 2 additions and 2 deletions

View File

@ -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="))
{

View File

@ -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"