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

BUG: Use CMakeDefaultMakeRuleVariables.cmake to locate modules directory instead of FindVTK.cmake.

This commit is contained in:
Brad King 2003-01-21 16:46:24 -05:00
parent 0b324df1bb
commit 7418ed1a67
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmake.cxx
View File

@ -410,7 +410,7 @@ int cmake::AddCMakePaths(const char *arg0)
if (getenv("CMAKE_ROOT")) if (getenv("CMAKE_ROOT"))
{ {
cMakeRoot = getenv("CMAKE_ROOT"); cMakeRoot = getenv("CMAKE_ROOT");
modules = cMakeRoot + "/Modules/FindVTK.cmake"; modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake";
} }
if(!cmSystemTools::FileExists(modules.c_str())) if(!cmSystemTools::FileExists(modules.c_str()))
{ {
@ -422,21 +422,21 @@ int cmake::AddCMakePaths(const char *arg0)
cMakeRoot = cMakeRoot.substr(0, slashPos); cMakeRoot = cMakeRoot.substr(0, slashPos);
} }
// is there no Modules direcory there? // is there no Modules direcory there?
modules = cMakeRoot + "/Modules/FindVTK.cmake"; modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake";
} }
if (!cmSystemTools::FileExists(modules.c_str())) if (!cmSystemTools::FileExists(modules.c_str()))
{ {
// try exe/../share/cmake // try exe/../share/cmake
cMakeRoot += "/share/CMake"; cMakeRoot += "/share/CMake";
modules = cMakeRoot + "/Modules/FindVTK.cmake"; modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake";
} }
#ifdef CMAKE_ROOT_DIR #ifdef CMAKE_ROOT_DIR
if (!cmSystemTools::FileExists(modules.c_str())) if (!cmSystemTools::FileExists(modules.c_str()))
{ {
// try compiled in root directory // try compiled in root directory
cMakeRoot = CMAKE_ROOT_DIR; cMakeRoot = CMAKE_ROOT_DIR;
modules = cMakeRoot + "/Modules/FindVTK.cmake"; modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake";
} }
#endif #endif
#ifdef CMAKE_PREFIX #ifdef CMAKE_PREFIX
@ -444,7 +444,7 @@ int cmake::AddCMakePaths(const char *arg0)
{ {
// try compiled in install prefix // try compiled in install prefix
cMakeRoot = CMAKE_PREFIX "/share/CMake"; cMakeRoot = CMAKE_PREFIX "/share/CMake";
modules = cMakeRoot + "/Modules/FindVTK.cmake"; modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake";
} }
#endif #endif
if (!cmSystemTools::FileExists(modules.c_str())) if (!cmSystemTools::FileExists(modules.c_str()))
@ -452,14 +452,14 @@ int cmake::AddCMakePaths(const char *arg0)
// try // try
cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str()); cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str());
cMakeRoot += "/share/CMake"; cMakeRoot += "/share/CMake";
modules = cMakeRoot + "/Modules/FindVTK.cmake"; modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake";
} }
if(!cmSystemTools::FileExists(modules.c_str())) if(!cmSystemTools::FileExists(modules.c_str()))
{ {
// next try exe // next try exe
cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str()); cMakeRoot = cmSystemTools::GetProgramPath(cMakeSelf.c_str());
// is there no Modules direcory there? // is there no Modules direcory there?
modules = cMakeRoot + "/Modules/FindVTK.cmake"; modules = cMakeRoot + "/Modules/CMakeDefaultMakeRuleVariables.cmake";
} }
if (!cmSystemTools::FileExists(modules.c_str())) if (!cmSystemTools::FileExists(modules.c_str()))
{ {