[cmake-commits] king committed CMakeSetup.cxx 1.8 1.9

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Dec 13 17:56:52 EST 2007


Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv18488/Source/QtDialog

Modified Files:
	CMakeSetup.cxx 
Log Message:
ENH: Centralized and globalized computation of CMake program locations.  This eliminates startup paths that failed to produce this information.


Index: CMakeSetup.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetup.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CMakeSetup.cxx	27 Nov 2007 06:04:02 -0000	1.8
+++ CMakeSetup.cxx	13 Dec 2007 22:56:50 -0000	1.9
@@ -21,6 +21,7 @@
 
 #include "CMakeSetupDialog.h"
 #include "cmDocumentation.h"
+#include "cmSystemTools.h"
 #include "cmake.h"
 
 //----------------------------------------------------------------------------
@@ -61,6 +62,7 @@
 
 int main(int argc, char** argv)
 {
+  cmSystemTools::FindExecutableDirectory(argv[0]);
   QApplication app(argc, argv);
   app.setApplicationName("CMakeSetup");
   app.setOrganizationName("Kitware");
@@ -72,7 +74,7 @@
     {
     // Construct and print requested documentation.
     cmake hcm;
-    hcm.AddCMakePaths(app.argv()[0]);
+    hcm.AddCMakePaths();
     doc.SetCMakeRoot(hcm.GetCacheDefinition("CMAKE_ROOT"));
     std::vector<cmDocumentationEntry> commands;
     std::vector<cmDocumentationEntry> compatCommands;



More information about the Cmake-commits mailing list