summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2005-05-25 15:18:41 (GMT)
committerKen Martin <ken.martin@kitware.com>2005-05-25 15:18:41 (GMT)
commit193747256b86eee84028147c16a8b613636c5545 (patch)
tree4dd431490eba6be606dae97d7844f57e68b1a7d9
parent89e65c2c0b0cbeeff504ed589ab590f3a91c5f25 (diff)
downloadCMake-193747256b86eee84028147c16a8b613636c5545.zip
CMake-193747256b86eee84028147c16a8b613636c5545.tar.gz
CMake-193747256b86eee84028147c16a8b613636c5545.tar.bz2
ENH: switch to using new Unix Makefile generator for Unix as well
-rw-r--r--Source/cmGlobalUnixMakefileGenerator.h2
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.h2
-rw-r--r--Source/cmake.cxx2
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)