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/cmGlobalBorlandMakefileGenerator.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/cmGlobalBorlandMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalBorlandMakefileGenerator.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx index d6aa008..7e85f3a 100644 --- a/Source/cmGlobalBorlandMakefileGenerator.cxx +++ b/Source/cmGlobalBorlandMakefileGenerator.cxx @@ -39,13 +39,14 @@ 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"); - - + mf->AddDefinition("CMAKE_GENERATOR_CXX", "bcc32"); + if(!mf->GetDefinition("CMAKE_MAKE_PROGRAM") + || cmSystemTools::IsOff(mf->GetDefinition("CMAKE_MAKE_PROGRAM"))) + { + std::string setMakeProgram = mf->GetDefinition("CMAKE_ROOT"); + setMakeProgram += "/Modules/CMakeBorlandFindMake.cmake"; + mf->ReadListFile(0, setMakeProgram.c_str()); + } this->cmGlobalUnixMakefileGenerator::EnableLanguage(l, mf); } |