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

ENH: use home not start

This commit is contained in:
Bill Hoffman 2002-04-18 14:51:33 -04:00
parent 5ba411dd64
commit 06922e1ac6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmake.cxx
View File

@ -356,12 +356,12 @@ int cmake::Generate(const std::vector<std::string>& args, bool buildMakefiles)
// Read and parse the input makefile // Read and parse the input makefile
mf.MakeStartDirectoriesCurrent(); mf.MakeStartDirectoriesCurrent();
cmCacheManager::GetInstance()->LoadCache(&mf); cmCacheManager::GetInstance()->LoadCache(&mf);
if(mf.GetDefinition("CMAKE_START_DIRECTORY")) if(mf.GetDefinition("CMAKE_HOME_DIRECTORY"))
{ {
std::string cacheStart = std::string cacheStart =
cmSystemTools::CollapseFullPath(mf.GetDefinition("CMAKE_START_DIRECTORY")); cmSystemTools::CollapseFullPath(mf.GetDefinition("CMAKE_HOME_DIRECTORY"));
std::string currentStart = std::string currentStart =
cmSystemTools::CollapseFullPath(mf.GetStartDirectory()); cmSystemTools::CollapseFullPath(mf.GetHomeDirectory());
#ifdef _WIN32 #ifdef _WIN32
cacheStart = cmSystemTools::LowerCase(cacheStart); cacheStart = cmSystemTools::LowerCase(cacheStart);
currentStart = cmSystemTools::LowerCase(currentStart); currentStart = cmSystemTools::LowerCase(currentStart);
@ -377,7 +377,7 @@ int cmake::Generate(const std::vector<std::string>& args, bool buildMakefiles)
return -1; return -1;
} }
} }
mf.AddCacheDefinition("CMAKE_START_DIRECTORY", mf.GetStartDirectory(), mf.AddCacheDefinition("CMAKE_HOME_DIRECTORY", mf.GetHomeDirectory(),
"Start directory with the top level CMakeLists.txt file for this project", "Start directory with the top level CMakeLists.txt file for this project",
cmCacheManager::INTERNAL); cmCacheManager::INTERNAL);