[cmake-commits] king committed CMakeSetup.cpp 1.19 1.20

[cmake-commits at cmake.org]

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

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


Index: CMakeSetup.cpp
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/MFCDialog/CMakeSetup.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- CMakeSetup.cpp	24 Oct 2007 15:36:47 -0000	1.19
+++ CMakeSetup.cpp	13 Dec 2007 22:56:50 -0000	1.20
@@ -7,6 +7,7 @@
 #include "CMakeCommandLineInfo.h" 
 #include "../cmDocumentation.h"
 #include "../cmake.h"
+#include "../cmSystemTools.h"
 
 
 //----------------------------------------------------------------------------
@@ -101,6 +102,7 @@
 #endif
   CMakeCommandLineInfo cmdInfo;
   ParseCommandLine(cmdInfo);
+  cmSystemTools::FindExecutableDirectory(cmdInfo.GetArgV()[0]);
 
   // Check for documentation options.  If there are no arguments skip
   // the check because the GUI should be displayed instead of showing
@@ -111,7 +113,7 @@
     {
     // Construct and print requested documentation.
     cmake hcm;
-    hcm.AddCMakePaths(cmdInfo.GetArgV()[0]);
+    hcm.AddCMakePaths();
     doc.SetCMakeRoot(hcm.GetCacheDefinition("CMAKE_ROOT"));
     std::vector<cmDocumentationEntry> commands;
     std::vector<cmDocumentationEntry> compatCommands;