diff options
| author | Brad King <brad.king@kitware.com> | 2005-03-01 17:27:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2005-03-01 17:27:06 (GMT) |
| commit | c7beb286577b9b2377615e2714fcafef4b63176b (patch) | |
| tree | 15a6db4e9ce0aa7c026a9e0fdf88e34b32442382 | |
| parent | 54c99dc5fdfb845a3ae5076f5daa812adda36ad1 (diff) | |
| download | CMake-c7beb286577b9b2377615e2714fcafef4b63176b.zip CMake-c7beb286577b9b2377615e2714fcafef4b63176b.tar.gz CMake-c7beb286577b9b2377615e2714fcafef4b63176b.tar.bz2 | |
ENH: Enabling cmLocalUnixMakefileGenerator2 by default.
| -rw-r--r-- | Source/cmGlobalBorlandMakefileGenerator.cxx | 8 | ||||
| -rw-r--r-- | Source/cmGlobalNMakeMakefileGenerator.cxx | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx index 4f5eef7..477004c 100644 --- a/Source/cmGlobalBorlandMakefileGenerator.cxx +++ b/Source/cmGlobalBorlandMakefileGenerator.cxx @@ -15,9 +15,10 @@ =========================================================================*/ #include "cmGlobalBorlandMakefileGenerator.h" -#include "cmLocalUnixMakefileGenerator.h" +#include "cmLocalUnixMakefileGenerator2.h" #include "cmMakefile.h" #include "cmake.h" + cmGlobalBorlandMakefileGenerator::cmGlobalBorlandMakefileGenerator() { m_FindMakeProgramFile = "CMakeBorlandFindMake.cmake"; @@ -29,6 +30,7 @@ void cmGlobalBorlandMakefileGenerator::EnableLanguage(std::vector<std::string>co cmMakefile *mf) { std::string outdir = m_CMakeInstance->GetStartOutputDirectory(); + mf->AddDefinition("CMAKE_GENERATOR_NEW", "1"); mf->AddDefinition("BORLAND", "1"); mf->AddDefinition("CMAKE_GENERATOR_CC", "bcc32"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "bcc32"); @@ -38,7 +40,9 @@ void cmGlobalBorlandMakefileGenerator::EnableLanguage(std::vector<std::string>co ///! Create a local generator appropriate to this Global Generator cmLocalGenerator *cmGlobalBorlandMakefileGenerator::CreateLocalGenerator() { - cmLocalUnixMakefileGenerator *lg = new cmLocalUnixMakefileGenerator; + cmLocalUnixMakefileGenerator2* lg = new cmLocalUnixMakefileGenerator2; + lg->SetEmptyCommand("@REM Borland Make needs a command here."); + lg->SetEchoNeedsQuote(false); lg->SetIncludeDirective("!include"); lg->SetWindowsShell(true); lg->SetMakefileVariableSize(32); diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx index 5d6d82f..198211b 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.cxx +++ b/Source/cmGlobalNMakeMakefileGenerator.cxx @@ -15,10 +15,9 @@ =========================================================================*/ #include "cmGlobalNMakeMakefileGenerator.h" -#include "cmLocalUnixMakefileGenerator.h" +#include "cmLocalUnixMakefileGenerator2.h" #include "cmMakefile.h" - cmGlobalNMakeMakefileGenerator::cmGlobalNMakeMakefileGenerator() { m_FindMakeProgramFile = "CMakeNMakeFindMake.cmake"; @@ -29,6 +28,7 @@ void cmGlobalNMakeMakefileGenerator::EnableLanguage(std::vector<std::string>cons cmMakefile *mf) { // pick a default + mf->AddDefinition("CMAKE_GENERATOR_NEW", "1"); mf->AddDefinition("CMAKE_GENERATOR_CC", "cl"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl"); this->cmGlobalUnixMakefileGenerator::EnableLanguage(l, mf); @@ -37,7 +37,8 @@ void cmGlobalNMakeMakefileGenerator::EnableLanguage(std::vector<std::string>cons ///! Create a local generator appropriate to this Global Generator cmLocalGenerator *cmGlobalNMakeMakefileGenerator::CreateLocalGenerator() { - cmLocalUnixMakefileGenerator *lg = new cmLocalUnixMakefileGenerator; + cmLocalUnixMakefileGenerator2* lg = new cmLocalUnixMakefileGenerator2; + lg->SetEchoNeedsQuote(false); lg->SetWindowsShell(true); lg->SetMakeSilentFlag("/nologo"); lg->SetGlobalGenerator(this); |