diff options
| author | Brad King <brad.king@kitware.com> | 2003-07-21 20:38:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2003-07-21 20:38:53 (GMT) |
| commit | a1bb1a47129380421fd9490688502ce5bee2e59f (patch) | |
| tree | fadcd7e650d2da27ca29c2a5da6195969abe355b /Source/cmake.cxx | |
| parent | d4afed0724866e093f0ae5bf8895ab1e1db3e4c4 (diff) | |
| download | CMake-a1bb1a47129380421fd9490688502ce5bee2e59f.zip CMake-a1bb1a47129380421fd9490688502ce5bee2e59f.tar.gz CMake-a1bb1a47129380421fd9490688502ce5bee2e59f.tar.bz2 | |
ENH: Added optional configuration of data/doc/man dirs. This will be useful for package maintainers.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index f073271..45838ba 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -445,7 +445,7 @@ int cmake::AddCMakePaths(const char *arg0) if (!cmSystemTools::FileExists(modules.c_str())) { // try exe/../share/cmake - cMakeRoot += "/share/CMake"; + cMakeRoot += CMAKE_DATA_DIR; modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; } #ifdef CMAKE_ROOT_DIR @@ -460,7 +460,7 @@ int cmake::AddCMakePaths(const char *arg0) if (!cmSystemTools::FileExists(modules.c_str())) { // try compiled in install prefix - cMakeRoot = CMAKE_PREFIX "/share/CMake"; + cMakeRoot = CMAKE_PREFIX CMAKE_DATA_DIR; modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; } #endif @@ -468,7 +468,7 @@ int cmake::AddCMakePaths(const char *arg0) { // try cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str()); - cMakeRoot += "/share/CMake"; + cMakeRoot += CMAKE_DATA_DIR; modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake"; } if(!cmSystemTools::FileExists(modules.c_str())) |