diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-06-15 20:07:16 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-06-15 20:07:16 (GMT) |
| commit | 6d200fa6be62a4708bfef1d05925d841fed7b487 (patch) | |
| tree | adff2397401d36deabb987d43627f3e185403584 | |
| parent | 510cb415d4d97a6c849e1c41ddb70457c8747213 (diff) | |
| download | CMake-6d200fa6be62a4708bfef1d05925d841fed7b487.zip CMake-6d200fa6be62a4708bfef1d05925d841fed7b487.tar.gz CMake-6d200fa6be62a4708bfef1d05925d841fed7b487.tar.bz2 | |
STYLE: minor fixes
Alex
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.h | 5 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 4 | ||||
| -rw-r--r-- | Source/cmake.cxx | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index c217400..0c8bf40 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1670,3 +1670,7 @@ void cmGlobalGenerator::SetExternalMakefileProjectGenerator( } } +const char* cmGlobalGenerator::GetExtraGeneratorName() const +{ + return this->ExtraGenerator==0 ? 0 : this->ExtraGenerator->GetName(); +} diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 3ab18bc..aea31fb 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -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(); diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 39ca4f8..502b886 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -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; } diff --git a/Source/cmake.cxx b/Source/cmake.cxx index b340917..d78949d 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -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 ) |