[cmake-commits] clinton committed CMakeSetup.cxx 1.11 1.12
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Feb 6 14:45:34 EST 2008
Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv20776
Modified Files:
CMakeSetup.cxx
Log Message:
BUG: On Mac OS X, give the CMake library the correct path to the cmake
exectuables. Fixes #6286.
Index: CMakeSetup.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetup.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- CMakeSetup.cxx 1 Feb 2008 16:48:00 -0000 1.11
+++ CMakeSetup.cxx 6 Feb 2008 19:45:32 -0000 1.12
@@ -64,8 +64,13 @@
int main(int argc, char** argv)
{
- cmSystemTools::FindExecutableDirectory(argv[0]);
QApplication app(argc, argv);
+
+ QDir cmExecDir(QApplication::applicationDirPath());
+#if defined(Q_OS_MAC)
+ cmExecDir.cd("../../../");
+#endif
+ cmSystemTools::FindExecutableDirectory(cmExecDir.filePath("cmake").toAscii().data());
QTranslator translator;
QString transfile = QString("cmake_%1").arg(QLocale::system().name());
More information about the Cmake-commits
mailing list