diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-12-03 21:19:16 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-12-03 21:19:16 (GMT) |
| commit | e2d1104881a8f1d303d48236df76ec39bc0db93f (patch) | |
| tree | c16f2d1c229ea782693334c5c83721c1dd02d21f /Source | |
| parent | de316cac0502503882c04a6c4172296f2abf2877 (diff) | |
| download | CMake-e2d1104881a8f1d303d48236df76ec39bc0db93f.zip CMake-e2d1104881a8f1d303d48236df76ec39bc0db93f.tar.gz CMake-e2d1104881a8f1d303d48236df76ec39bc0db93f.tar.bz2 | |
determine CMAKE_MAKE_PROGRAM in EnableLanguage
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalBorlandMakefileGenerator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmGlobalNMakeMakefileGenerator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator.cxx | 9 |
3 files changed, 16 insertions, 3 deletions
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx index e53fee6..d6aa008 100644 --- a/Source/cmGlobalBorlandMakefileGenerator.cxx +++ b/Source/cmGlobalBorlandMakefileGenerator.cxx @@ -40,6 +40,11 @@ void cmGlobalBorlandMakefileGenerator::EnableLanguage(const char* l, mf->AddDefinition("BORLAND", "1"); mf->AddDefinition("CMAKE_GENERATOR_CC", "bcc32"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "bcc32"); + std::string setMakeProgram = mf->GetDefinition("CMAKE_ROOT"); + setMakeProgram += "/Modules/CMakeBorlandFindMake.cmake"; + mf->ReadListFile(0, setMakeProgram.c_str()); + mf->AddDefinition("CMAKE_MAKE_PROGRAM", "make"); + this->cmGlobalUnixMakefileGenerator::EnableLanguage(l, mf); } diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx index ce0dbd2..114876f 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.cxx +++ b/Source/cmGlobalNMakeMakefileGenerator.cxx @@ -24,7 +24,10 @@ void cmGlobalNMakeMakefileGenerator::EnableLanguage(const char* l, // pick a default mf->AddDefinition("CMAKE_GENERATOR_CC", "cl"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl"); - + std::string setMakeProgram = mf->GetDefinition("CMAKE_ROOT"); + setMakeProgram += "/Modules/CMakeNMakeFindMake.cmake"; + mf->ReadListFile(0, setMakeProgram.c_str()); + this->cmGlobalUnixMakefileGenerator::EnableLanguage(l, mf); } diff --git a/Source/cmGlobalUnixMakefileGenerator.cxx b/Source/cmGlobalUnixMakefileGenerator.cxx index d6082c7..fbe0eef 100644 --- a/Source/cmGlobalUnixMakefileGenerator.cxx +++ b/Source/cmGlobalUnixMakefileGenerator.cxx @@ -23,14 +23,19 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(const char* lang, cmMakefile *mf) { + if(!mf->GetDefinition("CMAKE_MAKE_PROGRAM")) + { + std::string setMakeProgram = mf->GetDefinition("CMAKE_ROOT"); + setMakeProgram += "/Modules/CMakeUnixFindMake.cmake"; + mf->ReadListFile(0, setMakeProgram.c_str()); + } + bool isLocal = m_CMakeInstance->GetLocal(); // if no lang specified use CXX if(!lang ) { lang = "CXX"; } - //std::string root - // = cmSystemTools::ConvertToOutputPath(mf->GetDefinition("CMAKE_ROOT")); std::string root = mf->GetDefinition("CMAKE_ROOT"); std::string rootBin = mf->GetHomeOutputDirectory(); if(m_ConfiguredFilesPath.size()) |