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

ENH: switch to using new Unix Makefile generator for Unix as well

Browse Source
This commit is contained in:
Ken Martin 2005-05-25 11:18:41 -04:00
parent 89e65c2c0b
commit 193747256b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalUnixMakefileGenerator.h
View File

@ -33,7 +33,7 @@ public:
///! Get the name for the generator. ///! Get the name for the generator.
virtual const char* GetName() const { virtual const char* GetName() const {
return cmGlobalUnixMakefileGenerator::GetActualName();} 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. */ /** Get the documentation entry for this generator. */
virtual void GetDocumentation(cmDocumentationEntry& entry) const; virtual void GetDocumentation(cmDocumentationEntry& entry) const;

2
Source/cmGlobalUnixMakefileGenerator3.h
View File

@ -36,7 +36,7 @@ public:
///! Get the name for the generator. ///! Get the name for the generator.
virtual const char* GetName() const { virtual const char* GetName() const {
return cmGlobalUnixMakefileGenerator3::GetActualName();} 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. */ /** Get the documentation entry for this generator. */
virtual void GetDocumentation(cmDocumentationEntry& entry) const; virtual void GetDocumentation(cmDocumentationEntry& entry) const;

2
Source/cmake.cxx
View File

@ -1111,7 +1111,7 @@ int cmake::Configure()
} }
this->SetGlobalGenerator(gen); this->SetGlobalGenerator(gen);
#else #else
this->SetGlobalGenerator(new cmGlobalUnixMakefileGenerator); this->SetGlobalGenerator(new cmGlobalUnixMakefileGenerator3);
#endif #endif
} }
if(!m_GlobalGenerator) if(!m_GlobalGenerator)