diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-04 02:05:58 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-04 02:05:58 (GMT) |
commit | 6e217924ce793d1dec2a10a755ff5663bc57cbb7 (patch) | |
tree | 85010d266e87d45d03d109d323c2c5f10869d7a3 /Source/cmGlobalGenerator.cxx | |
parent | 71505ff2d2d9c5374281edcc20b281781be06e0f (diff) | |
download | CMake-6e217924ce793d1dec2a10a755ff5663bc57cbb7.zip CMake-6e217924ce793d1dec2a10a755ff5663bc57cbb7.tar.gz CMake-6e217924ce793d1dec2a10a755ff5663bc57cbb7.tar.bz2 |
ENH: use correct addcache call to fix build tools
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r-- | Source/cmGlobalGenerator.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 51dac3a..6b64277 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -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); } } |