From 193747256b86eee84028147c16a8b613636c5545 Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Wed, 25 May 2005 11:18:41 -0400 Subject: ENH: switch to using new Unix Makefile generator for Unix as well --- Source/cmGlobalUnixMakefileGenerator.h | 2 +- Source/cmGlobalUnixMakefileGenerator3.h | 2 +- Source/cmake.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmGlobalUnixMakefileGenerator.h b/Source/cmGlobalUnixMakefileGenerator.h index a8af431..df05616e 100644 --- a/Source/cmGlobalUnixMakefileGenerator.h +++ b/Source/cmGlobalUnixMakefileGenerator.h @@ -33,7 +33,7 @@ public: ///! Get the name for the generator. virtual const char* GetName() const { return cmGlobalUnixMakefileGenerator::GetActualName();} - static const char* GetActualName() {return "Unix Makefiles";} + static const char* GetActualName() {return "Unix Makefiles 2";} /** Get the documentation entry for this generator. */ virtual void GetDocumentation(cmDocumentationEntry& entry) const; diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index e1b0634..875b582 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.h +++ b/Source/cmGlobalUnixMakefileGenerator3.h @@ -36,7 +36,7 @@ public: ///! Get the name for the generator. virtual const char* GetName() const { return cmGlobalUnixMakefileGenerator3::GetActualName();} - static const char* GetActualName() {return "Unix Makefiles 3";} + static const char* GetActualName() {return "Unix Makefiles";} /** Get the documentation entry for this generator. */ virtual void GetDocumentation(cmDocumentationEntry& entry) const; diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 33962ff..f022df7 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1111,7 +1111,7 @@ int cmake::Configure() } this->SetGlobalGenerator(gen); #else - this->SetGlobalGenerator(new cmGlobalUnixMakefileGenerator); + this->SetGlobalGenerator(new cmGlobalUnixMakefileGenerator3); #endif } if(!m_GlobalGenerator) -- cgit v0.12