diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-12-04 15:57:22 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-12-04 15:57:22 (GMT) |
| commit | 1e8914ada8834a9ed6e3a10a8575c14947df157e (patch) | |
| tree | 3d84c1cdff204fb3025f0d1af5762d5c02d6872c /Source/cmGlobalUnixMakefileGenerator.cxx | |
| parent | 3a211819410ba0433cf8b713e894683b2f612345 (diff) | |
| download | CMake-1e8914ada8834a9ed6e3a10a8575c14947df157e.zip CMake-1e8914ada8834a9ed6e3a10a8575c14947df157e.tar.gz CMake-1e8914ada8834a9ed6e3a10a8575c14947df157e.tar.bz2 | |
BUG: fix get make command problems.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator.cxx b/Source/cmGlobalUnixMakefileGenerator.cxx index fbe0eef..5132f25 100644 --- a/Source/cmGlobalUnixMakefileGenerator.cxx +++ b/Source/cmGlobalUnixMakefileGenerator.cxx @@ -23,7 +23,8 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(const char* lang, cmMakefile *mf) { - if(!mf->GetDefinition("CMAKE_MAKE_PROGRAM")) + if(!mf->GetDefinition("CMAKE_MAKE_PROGRAM") + || cmSystemTools::IsOff(mf->GetDefinition("CMAKE_MAKE_PROGRAM"))) { std::string setMakeProgram = mf->GetDefinition("CMAKE_ROOT"); setMakeProgram += "/Modules/CMakeUnixFindMake.cmake"; @@ -155,7 +156,13 @@ cmLocalGenerator *cmGlobalUnixMakefileGenerator::CreateLocalGenerator() void cmGlobalUnixMakefileGenerator::EnableLanguagesFromGenerator(cmGlobalGenerator *gen) { - this->SetConfiguredFilesPath(gen->GetCMakeInstance()->GetHomeOutputDirectory()); + this->SetConfiguredFilesPath( + gen->GetCMakeInstance()->GetHomeOutputDirectory()); + const char* make = + gen->GetCMakeInstance()->GetCacheDefinition("CMAKE_MAKE_PROGRAM"); + this->GetCMakeInstance()->AddCacheEntry("CMAKE_MAKE_PROGRAM", make, + "make program", + cmCacheManager::FILEPATH); // if C, then enable C if(gen->GetLanguageEnabled("C")) { |