kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fixed generation of cMakeRoot in one case.

Browse Source
This commit is contained in:
Brad King 2001-06-22 12:18:52 -04:00
parent fda8bcc978
commit 10e0197054
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmake.cxx
View File

@ -126,7 +126,7 @@ void cmake::SetArgs(cmMakefile& builder, const std::vector<std::string>& args)
} }
} }
// at the end of this CMAKE_ROOT and CMAAKE_COMMAND should be added to the cache // at the end of this CMAKE_ROOT and CMAKE_COMMAND should be added to the cache
void cmake::AddCMakePaths(const std::vector<std::string>& args) void cmake::AddCMakePaths(const std::vector<std::string>& args)
{ {
// Find our own executable. // Find our own executable.
@ -183,7 +183,8 @@ void cmake::AddCMakePaths(const std::vector<std::string>& args)
if (!cmSystemTools::FileExists(modules.c_str())) if (!cmSystemTools::FileExists(modules.c_str()))
{ {
// try exe/../share/cmake // try exe/../share/cmake
modules = cMakeRoot + "/share/CMake/Modules/FindVTK.cmake"; cMakeRoot += "/share/CMake";
modules = cMakeRoot + "/Modules/FindVTK.cmake";
} }
#ifdef CMAKE_ROOT_DIR #ifdef CMAKE_ROOT_DIR
if (!cmSystemTools::FileExists(modules.c_str())) if (!cmSystemTools::FileExists(modules.c_str()))