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

bug fix in finding CMAKE_ROOT

This commit is contained in:
Ken Martin 2001-05-21 11:13:56 -04:00
parent 92d59accce
commit d7976058e4
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmake.cxx
View File

@ -180,19 +180,23 @@ void cmake::AddCMakePaths(char **av)
{ {
// try exe/../share/cmake // try exe/../share/cmake
modules = cMakeRoot + "/share/CMake/Modules"; modules = cMakeRoot + "/share/CMake/Modules";
if (!cmSystemTools::FileIsDirectory(modules.c_str()))
{
#if !defined(_WIN32) || defined(__CYGWIN__) #if !defined(_WIN32) || defined(__CYGWIN__)
if (!cmSystemTools::FileIsDirectory(modules.c_str()))
{
// try compiled in value on UNIX // try compiled in value on UNIX
std::string cMakeRoot = CMAKE_ROOT_DIR; cMakeRoot = CMAKE_ROOT_DIR;
modules = cMakeRoot + "/Modules"; modules = cMakeRoot + "/Modules";
}
#endif #endif
if (!cmSystemTools::FileIsDirectory(modules.c_str())) if (!cmSystemTools::FileIsDirectory(modules.c_str()))
{
// couldn't find modules
cmSystemTools::Error("Could not find CMAKE_ROOT !!!");
return;
}
}
else
{ {
// couldn't find modules cMakeRoot = cMakeRoot + "/share/CMake";
cmSystemTools::Error("Could nto find CMAKE_ROOT !!!");
return;
} }
} }
} }