diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-02-16 18:05:03 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-02-16 18:05:03 (GMT) |
| commit | 22927ede1e74e43ad78699ff4082d8b78e50599c (patch) | |
| tree | 6f6bd3e1613623e7f9e7356ef798a02fe553df84 /Source/QtDialog/QCMake.cxx | |
| parent | 337c1f0b7230d6b0b4674d1d7168eef5a6dce6cd (diff) | |
| download | CMake-22927ede1e74e43ad78699ff4082d8b78e50599c.zip CMake-22927ede1e74e43ad78699ff4082d8b78e50599c.tar.gz CMake-22927ede1e74e43ad78699ff4082d8b78e50599c.tar.bz2 | |
ENH: support for cpack and install of cmake-gui as mac app bundle
Diffstat (limited to 'Source/QtDialog/QCMake.cxx')
| -rw-r--r-- | Source/QtDialog/QCMake.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index 047abde..4f4ce37 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -34,13 +34,19 @@ QCMake::QCMake(QObject* p) QDir execDir(QCoreApplication::applicationDirPath()); #if defined(Q_OS_MAC) - execDir.cd("../../../"); + if(execDir.exists("../bin/cmake")) + { + execDir.cd("../bin"); + } + else + { + execDir.cd("../../../"); // path to cmake in build directory (need to fix for deployment) + } #endif QString cmakeCommand = QString("cmake")+cmSystemTools::GetExecutableExtension(); cmakeCommand = execDir.filePath(cmakeCommand); - cmSystemTools::DisableRunCommandOutput(); cmSystemTools::SetRunCommandHideConsole(true); cmSystemTools::SetErrorCallback(QCMake::errorCallback, this); |