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

ENH: use correct addcache call to fix build tools

This commit is contained in:
Bill Hoffman 2006-04-03 22:05:58 -04:00
parent 71505ff2d2
commit 6e217924ce
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmGlobalGenerator.cxx
View File

@ -95,10 +95,11 @@ void cmGlobalGenerator::FindMakeProgram(cmMakefile* mf)
makeProgram = dir;
makeProgram += "/";
makeProgram += saveFile;
this->GetCMakeInstance()->AddCacheEntry("CMAKE_MAKE_PROGRAM", makeProgram.c_str(),
"make program",
cmCacheManager::FILEPATH);
mf->AddCacheDefinition("CMAKE_MAKE_PROGRAM", makeProgram.c_str(),
"make program",
cmCacheManager::FILEPATH);
}
if(makeProgram.find("xcodebuild") != makeProgram.npos)
{
// due to the text file busy /bin/sh problem with xcodebuild
@ -112,11 +113,10 @@ void cmGlobalGenerator::FindMakeProgram(cmMakefile* mf)
cmakexbuild = cmakexbuild.substr(0, cmakexbuild.length()-5);
cmakexbuild += "cmakexbuild";
this->GetCMakeInstance()->AddCacheEntry("CMAKE_MAKE_PROGRAM",
cmakexbuild.c_str(),
"make program",
cmCacheManager::FILEPATH);
mf->AddCacheDefinition("CMAKE_MAKE_PROGRAM",
cmakexbuild.c_str(),
"make program",
cmCacheManager::FILEPATH);
}
}