kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Enabling cmLocalUnixMakefileGenerator2 by default.

This commit is contained in:
Brad King 2005-03-01 12:27:06 -05:00
parent 54c99dc5fd
commit c7beb28657
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGlobalBorlandMakefileGenerator.cxx
View File

@ -15,9 +15,10 @@
=========================================================================*/ =========================================================================*/
#include "cmGlobalBorlandMakefileGenerator.h" #include "cmGlobalBorlandMakefileGenerator.h"
#include "cmLocalUnixMakefileGenerator.h" #include "cmLocalUnixMakefileGenerator2.h"
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmake.h" #include "cmake.h"
cmGlobalBorlandMakefileGenerator::cmGlobalBorlandMakefileGenerator() cmGlobalBorlandMakefileGenerator::cmGlobalBorlandMakefileGenerator()
{ {
m_FindMakeProgramFile = "CMakeBorlandFindMake.cmake"; m_FindMakeProgramFile = "CMakeBorlandFindMake.cmake";
@ -29,6 +30,7 @@ void cmGlobalBorlandMakefileGenerator::EnableLanguage(std::vector<std::string>co
cmMakefile *mf) cmMakefile *mf)
{ {
std::string outdir = m_CMakeInstance->GetStartOutputDirectory(); std::string outdir = m_CMakeInstance->GetStartOutputDirectory();
mf->AddDefinition("CMAKE_GENERATOR_NEW", "1");
mf->AddDefinition("BORLAND", "1"); mf->AddDefinition("BORLAND", "1");
mf->AddDefinition("CMAKE_GENERATOR_CC", "bcc32"); mf->AddDefinition("CMAKE_GENERATOR_CC", "bcc32");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "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 ///! Create a local generator appropriate to this Global Generator
cmLocalGenerator *cmGlobalBorlandMakefileGenerator::CreateLocalGenerator() 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->SetIncludeDirective("!include");
lg->SetWindowsShell(true); lg->SetWindowsShell(true);
lg->SetMakefileVariableSize(32); lg->SetMakefileVariableSize(32);

7
Source/cmGlobalNMakeMakefileGenerator.cxx
View File

@ -15,10 +15,9 @@
=========================================================================*/ =========================================================================*/
#include "cmGlobalNMakeMakefileGenerator.h" #include "cmGlobalNMakeMakefileGenerator.h"
#include "cmLocalUnixMakefileGenerator.h" #include "cmLocalUnixMakefileGenerator2.h"
#include "cmMakefile.h" #include "cmMakefile.h"
cmGlobalNMakeMakefileGenerator::cmGlobalNMakeMakefileGenerator() cmGlobalNMakeMakefileGenerator::cmGlobalNMakeMakefileGenerator()
{ {
m_FindMakeProgramFile = "CMakeNMakeFindMake.cmake"; m_FindMakeProgramFile = "CMakeNMakeFindMake.cmake";
@ -29,6 +28,7 @@ void cmGlobalNMakeMakefileGenerator::EnableLanguage(std::vector<std::string>cons
cmMakefile *mf) cmMakefile *mf)
{ {
// pick a default // pick a default
mf->AddDefinition("CMAKE_GENERATOR_NEW", "1");
mf->AddDefinition("CMAKE_GENERATOR_CC", "cl"); mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
this->cmGlobalUnixMakefileGenerator::EnableLanguage(l, mf); 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 ///! Create a local generator appropriate to this Global Generator
cmLocalGenerator *cmGlobalNMakeMakefileGenerator::CreateLocalGenerator() cmLocalGenerator *cmGlobalNMakeMakefileGenerator::CreateLocalGenerator()
{ {
cmLocalUnixMakefileGenerator *lg = new cmLocalUnixMakefileGenerator; cmLocalUnixMakefileGenerator2* lg = new cmLocalUnixMakefileGenerator2;
lg->SetEchoNeedsQuote(false);
lg->SetWindowsShell(true); lg->SetWindowsShell(true);
lg->SetMakeSilentFlag("/nologo"); lg->SetMakeSilentFlag("/nologo");
lg->SetGlobalGenerator(this); lg->SetGlobalGenerator(this);