diff options
author | Brad King <brad.king@kitware.com> | 2007-12-13 22:56:50 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2007-12-13 22:56:50 (GMT) |
commit | 9f61e2a235fc04e57237dc932aee61b264ef8916 (patch) | |
tree | 482f697639a0e55198f198eaf67282f088dee202 /Source/MFCDialog | |
parent | ebc036bbdaa602c9276ad91469a305b42fda7cbc (diff) | |
download | CMake-9f61e2a235fc04e57237dc932aee61b264ef8916.zip CMake-9f61e2a235fc04e57237dc932aee61b264ef8916.tar.gz CMake-9f61e2a235fc04e57237dc932aee61b264ef8916.tar.bz2 |
ENH: Centralized and globalized computation of CMake program locations. This eliminates startup paths that failed to produce this information.
Diffstat (limited to 'Source/MFCDialog')
-rw-r--r-- | Source/MFCDialog/CMakeSetup.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/MFCDialog/CMakeSetup.cpp b/Source/MFCDialog/CMakeSetup.cpp index 6d25ba2..8d318a6 100644 --- a/Source/MFCDialog/CMakeSetup.cpp +++ b/Source/MFCDialog/CMakeSetup.cpp @@ -7,6 +7,7 @@ #include "CMakeCommandLineInfo.h" #include "../cmDocumentation.h" #include "../cmake.h" +#include "../cmSystemTools.h" //---------------------------------------------------------------------------- @@ -101,6 +102,7 @@ BOOL CMakeSetup::InitInstance() #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 @@ BOOL CMakeSetup::InitInstance() { // 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; |