diff options
| author | Brad King <brad.king@kitware.com> | 2003-01-21 21:46:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2003-01-21 21:46:24 (GMT) |
| commit | 7418ed1a6796f18c3fab71ec8f60a897f93472ee (patch) | |
| tree | 9eed36ddde6bb50bbb40af439b9ea07ec9c53cf0 | |
| parent | 0b324df1bbfaa2139bfb0a4c0f6e25794d6c37e2 (diff) | |
| download | CMake-7418ed1a6796f18c3fab71ec8f60a897f93472ee.zip CMake-7418ed1a6796f18c3fab71ec8f60a897f93472ee.tar.gz CMake-7418ed1a6796f18c3fab71ec8f60a897f93472ee.tar.bz2 | |
BUG: Use CMakeDefaultMakeRuleVariables.cmake to locate modules directory instead of FindVTK.cmake.
| -rw-r--r-- | Source/cmake.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 3705a59..87065d0 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -410,7 +410,7 @@ int cmake::AddCMakePaths(const char *arg0) if (getenv("CMAKE_ROOT")) { cMakeRoot = getenv("CMAKE_ROOT"); - modules = cMakeRoot + "/Modules/FindVTK.cmake"; + modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; } if(!cmSystemTools::FileExists(modules.c_str())) { @@ -422,21 +422,21 @@ int cmake::AddCMakePaths(const char *arg0) cMakeRoot = cMakeRoot.substr(0, slashPos); } // is there no Modules direcory there? - modules = cMakeRoot + "/Modules/FindVTK.cmake"; + modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; } if (!cmSystemTools::FileExists(modules.c_str())) { // try exe/../share/cmake cMakeRoot += "/share/CMake"; - modules = cMakeRoot + "/Modules/FindVTK.cmake"; + modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; } #ifdef CMAKE_ROOT_DIR if (!cmSystemTools::FileExists(modules.c_str())) { // try compiled in root directory cMakeRoot = CMAKE_ROOT_DIR; - modules = cMakeRoot + "/Modules/FindVTK.cmake"; + modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; } #endif #ifdef CMAKE_PREFIX @@ -444,7 +444,7 @@ int cmake::AddCMakePaths(const char *arg0) { // try compiled in install prefix cMakeRoot = CMAKE_PREFIX "/share/CMake"; - modules = cMakeRoot + "/Modules/FindVTK.cmake"; + modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; } #endif if (!cmSystemTools::FileExists(modules.c_str())) @@ -452,14 +452,14 @@ int cmake::AddCMakePaths(const char *arg0) // try cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str()); cMakeRoot += "/share/CMake"; - modules = cMakeRoot + "/Modules/FindVTK.cmake"; + modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; } if(!cmSystemTools::FileExists(modules.c_str())) { // next try exe cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str()); // is there no Modules direcory there? - modules = cMakeRoot + "/Modules/FindVTK.cmake"; + modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; } if (!cmSystemTools::FileExists(modules.c_str())) { |