diff options
| author | Brad King <brad.king@kitware.com> | 2005-03-01 17:26:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2005-03-01 17:26:25 (GMT) |
| commit | 2aa613b98c28daa5ed71f7b1798976197b467a76 (patch) | |
| tree | a192d565a5ad66139cbce34f0c30a811e076af79 /Source/cmGlobalUnixMakefileGenerator.cxx | |
| parent | e979735a195d45c3c1ed8657b0c4bad96aad90cf (diff) | |
| download | CMake-2aa613b98c28daa5ed71f7b1798976197b467a76.zip CMake-2aa613b98c28daa5ed71f7b1798976197b467a76.tar.gz CMake-2aa613b98c28daa5ed71f7b1798976197b467a76.tar.bz2 | |
ENH: Enabling cmLocalUnixMakefileGenerator2 (new makefile generator) by default.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator.cxx b/Source/cmGlobalUnixMakefileGenerator.cxx index b4b472d..e4b7f51 100644 --- a/Source/cmGlobalUnixMakefileGenerator.cxx +++ b/Source/cmGlobalUnixMakefileGenerator.cxx @@ -16,7 +16,7 @@ =========================================================================*/ #include "cmGlobalUnixMakefileGenerator.h" -#include "cmLocalUnixMakefileGenerator.h" +#include "cmLocalUnixMakefileGenerator2.h" #include "cmMakefile.h" #include "cmake.h" @@ -31,6 +31,7 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(std::vector<std::string>const cmMakefile *mf) { mf->AddDefinition("CMAKE_CFG_INTDIR","."); + mf->AddDefinition("CMAKE_GENERATOR_NEW", "1"); this->cmGlobalGenerator::EnableLanguage(languages, mf); std::string path; for(std::vector<std::string>::const_iterator l = languages.begin(); @@ -73,7 +74,7 @@ void cmGlobalUnixMakefileGenerator::EnableLanguage(std::vector<std::string>const ///! Create a local generator appropriate to this Global Generator cmLocalGenerator *cmGlobalUnixMakefileGenerator::CreateLocalGenerator() { - cmLocalGenerator *lg = new cmLocalUnixMakefileGenerator; + cmLocalGenerator* lg = new cmLocalUnixMakefileGenerator2; lg->SetGlobalGenerator(this); return lg; } |