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

STYLE: minor fixes 

Alex
This commit is contained in:
Alexander Neundorf 2007-06-15 16:07:16 -04:00
parent 510cb415d4
commit 6d200fa6be
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalGenerator.cxx
View File

@ -1670,3 +1670,7 @@ void cmGlobalGenerator::SetExternalMakefileProjectGenerator(
}
}
const char* cmGlobalGenerator::GetExtraGeneratorName() const
{
return this->ExtraGenerator==0 ? 0 : this->ExtraGenerator->GetName();
}

5
Source/cmGlobalGenerator.h
View File

@ -19,13 +19,13 @@
#define cmGlobalGenerator_h
#include "cmStandardIncludes.h"
#include "cmExternalMakefileProjectGenerator.h"
#include "cmTarget.h" // For cmTargets
class cmake;
class cmMakefile;
class cmLocalGenerator;
class cmExternalMakefileProjectGenerator;
class cmTarget;
/** \class cmGlobalGenerator
@ -126,8 +126,7 @@ public:
void SetExternalMakefileProjectGenerator(
cmExternalMakefileProjectGenerator *extraGenerator);
const char* GetExtraGeneratorName() const
{return this->ExtraGenerator!=0 ? this->ExtraGenerator->GetName():0;}
const char* GetExtraGeneratorName() const;
void AddInstallComponent(const char* component);
void EnableInstallTarget();

4
Source/cmMakefile.h
View File

@ -721,10 +721,10 @@ public:
///! Set/Get the preorder flag
void SetPreOrder(bool p) { this->PreOrder = p; }
bool GetPreOrder() { return this->PreOrder; }
bool GetPreOrder() const { return this->PreOrder; }
void AddInstallGenerator(cmInstallGenerator* g)
{ this->InstallGenerators.push_back(g); }
{ if(g) this->InstallGenerators.push_back(g); }
std::vector<cmInstallGenerator*>& GetInstallGenerators()
{ return this->InstallGenerators; }

2
Source/cmake.cxx
View File

@ -1817,7 +1817,7 @@ int cmake::Configure()
// We must have a bad generator selection. Wipe the cache entry so the
// user can select another.
this->CacheManager->RemoveCacheEntry("CMAKE_GENERATOR");
this->CacheManager->RemoveCacheEntry("CMAKE_EMP_GENERATOR");
this->CacheManager->RemoveCacheEntry("CMAKE_EXTRA_GENERATOR");
}
// only save the cache if there were no fatal errors
if ( !this->ScriptMode )