diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-08-26 18:55:55 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-08-26 18:55:55 (GMT) |
| commit | 66a08c10e5bd4b8eff58837cd58372a4dfdd19df (patch) | |
| tree | 9d094b67d0899a3cebdfeba8b0280d374e7f25db /Source/cmake.cxx | |
| parent | 7cdf5c4601ea2a791d35fafadd890508ce434c6f (diff) | |
| download | CMake-66a08c10e5bd4b8eff58837cd58372a4dfdd19df.zip CMake-66a08c10e5bd4b8eff58837cd58372a4dfdd19df.tar.gz CMake-66a08c10e5bd4b8eff58837cd58372a4dfdd19df.tar.bz2 | |
ENH: more uniform approach to enable language, one step closer to being able to enable a language without modifing cmake source code
Diffstat (limited to 'Source/cmake.cxx')
| -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 ca07acf..ae57145 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -560,7 +560,7 @@ int cmake::AddCMakePaths(const char *arg0) if (getenv("CMAKE_ROOT")) { cMakeRoot = getenv("CMAKE_ROOT"); - modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; + modules = cMakeRoot + "/Modules/CMake.cmake"; } if(!cmSystemTools::FileExists(modules.c_str())) { @@ -572,21 +572,21 @@ int cmake::AddCMakePaths(const char *arg0) cMakeRoot = cMakeRoot.substr(0, slashPos); } // is there no Modules direcory there? - modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; + modules = cMakeRoot + "/Modules/CMake.cmake"; } if (!cmSystemTools::FileExists(modules.c_str())) { // try exe/../share/cmake cMakeRoot += CMAKE_DATA_DIR; - modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; + modules = cMakeRoot + "/Modules/CMake.cmake"; } #ifdef CMAKE_ROOT_DIR if (!cmSystemTools::FileExists(modules.c_str())) { // try compiled in root directory cMakeRoot = CMAKE_ROOT_DIR; - modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; + modules = cMakeRoot + "/Modules/CMake.cmake"; } #endif #ifdef CMAKE_PREFIX @@ -594,7 +594,7 @@ int cmake::AddCMakePaths(const char *arg0) { // try compiled in install prefix cMakeRoot = CMAKE_PREFIX CMAKE_DATA_DIR; - modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; + modules = cMakeRoot + "/Modules/CMake.cmake"; } #endif if (!cmSystemTools::FileExists(modules.c_str())) @@ -602,14 +602,14 @@ int cmake::AddCMakePaths(const char *arg0) // try cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str()); cMakeRoot += CMAKE_DATA_DIR; - modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; + modules = cMakeRoot + "/Modules/CMake.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/CMakeDefaultMakeRuleVariables.cmake"; + modules = cMakeRoot + "/Modules/CMake.cmake"; } if (!cmSystemTools::FileExists(modules.c_str())) { |