diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-11-15 22:11:26 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-11-15 22:11:26 (GMT) |
| commit | 407afb906c6f3627d14acd959fb518d16caa5d7b (patch) | |
| tree | d54bf9fbdaceddb600e45c262aab4f8c8b400c20 /Source/cmBuildCommand.cxx | |
| parent | a6f5f8395ce28d50f28ce322f53c4390214ff956 (diff) | |
| download | CMake-407afb906c6f3627d14acd959fb518d16caa5d7b.zip CMake-407afb906c6f3627d14acd959fb518d16caa5d7b.tar.gz CMake-407afb906c6f3627d14acd959fb518d16caa5d7b.tar.bz2 | |
closer to nmake working, added CMAKE_MAKE_COMMAND instead of MAKECOMMAND used by Dart, nmake makefiles work with borland make and nmake
Diffstat (limited to 'Source/cmBuildCommand.cxx')
| -rw-r--r-- | Source/cmBuildCommand.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmBuildCommand.cxx b/Source/cmBuildCommand.cxx index 18037b4..a778883 100644 --- a/Source/cmBuildCommand.cxx +++ b/Source/cmBuildCommand.cxx @@ -58,6 +58,7 @@ bool cmBuildCommand::InitialPass(std::vector<std::string> const& args) std::string makecommand; std::string makeprogram = args[1]; m_Makefile->ExpandVariablesInString(makeprogram); + std::string compiler = m_Makefile->GetDefinition("CMAKE_CXX_COMPILER"); if(makeprogram.find("msdev") != std::string::npos || makeprogram.find("MSDEV") != std::string::npos ) { @@ -70,10 +71,11 @@ bool cmBuildCommand::InitialPass(std::vector<std::string> const& args) } else if(makeprogram.find("Borland") != std::string::npos || makeprogram.find("BORLAND") != std::string::npos || - makeprogram.find("borland") != std::string::npos) + makeprogram.find("borland") != std::string::npos || + compiler.find("Borland") != std::string::npos) { makecommand = makeprogram; - makecommand += " -K"; + makecommand += " -i"; } else { |