summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Despres <nicolas.despres@gmail.com>2011-03-26 13:52:19 (GMT)
committerPeter Collingbourne <peter@pcc.me.uk>2011-10-02 17:30:42 (GMT)
commit8a0eb78f3b49b1f999f4b0c0d5d23f4589b465f7 (patch)
tree1d73d615e27d684a252fdc76cccc0b02cb435eaa
parent4532d36cc948228ca5e1ed072b7907a84a78c0e7 (diff)
downloadCMake-8a0eb78f3b49b1f999f4b0c0d5d23f4589b465f7.zip
CMake-8a0eb78f3b49b1f999f4b0c0d5d23f4589b465f7.tar.gz
CMake-8a0eb78f3b49b1f999f4b0c0d5d23f4589b465f7.tar.bz2
Constify many getters of cmGlobalGenerator.
-rw-r--r--Source/cmGlobalGenerator.h32
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.h22
2 files changed, 27 insertions, 27 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 97cacc5..adf7b77 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -163,8 +163,8 @@ public:
int TryCompileTimeout;
- bool GetForceUnixPaths() {return this->ForceUnixPaths;}
- bool GetToolSupportsColor() { return this->ToolSupportsColor; }
+ bool GetForceUnixPaths() const { return this->ForceUnixPaths; }
+ bool GetToolSupportsColor() const { return this->ToolSupportsColor; }
///! return the language for the given extension
const char* GetLanguageFromExtension(const char* ext);
@@ -179,11 +179,11 @@ public:
virtual const char* GetCMakeCFGInitDirectory() { return "."; }
/** Get whether the generator should use a script for link commands. */
- bool GetUseLinkScript() { return this->UseLinkScript; }
+ bool GetUseLinkScript() const { return this->UseLinkScript; }
/** Get whether the generator should produce special marks on rules
producing symbolic (non-file) outputs. */
- bool GetNeedSymbolicMark() { return this->NeedSymbolicMark; }
+ bool GetNeedSymbolicMark() const { return this->NeedSymbolicMark; }
/*
* Determine what program to use for building the project.
@@ -213,7 +213,7 @@ public:
/** Get the manifest of all targets that will be built for each
configuration. This is valid during generation only. */
- cmTargetManifest const& GetTargetManifest() { return this->TargetManifest; }
+ cmTargetManifest const& GetTargetManifest() const { return this->TargetManifest; }
/** Get the content of a directory. Directory listings are loaded
from disk at most once and cached. During the generation step
@@ -224,17 +224,17 @@ public:
void AddTarget(cmTargets::value_type &v);
- virtual const char* GetAllTargetName() { return "ALL_BUILD"; }
- virtual const char* GetInstallTargetName() { return "INSTALL"; }
- virtual const char* GetInstallLocalTargetName() { return 0; }
- virtual const char* GetInstallStripTargetName() { return 0; }
- virtual const char* GetPreinstallTargetName() { return 0; }
- virtual const char* GetTestTargetName() { return "RUN_TESTS"; }
- virtual const char* GetPackageTargetName() { return "PACKAGE"; }
- virtual const char* GetPackageSourceTargetName(){ return 0; }
- virtual const char* GetEditCacheTargetName() { return 0; }
- virtual const char* GetRebuildCacheTargetName() { return 0; }
- virtual const char* GetCleanTargetName() { return 0; }
+ virtual const char* GetAllTargetName() const { return "ALL_BUILD"; }
+ virtual const char* GetInstallTargetName() const { return "INSTALL"; }
+ virtual const char* GetInstallLocalTargetName() const { return 0; }
+ virtual const char* GetInstallStripTargetName() const { return 0; }
+ virtual const char* GetPreinstallTargetName() const { return 0; }
+ virtual const char* GetTestTargetName() const { return "RUN_TESTS"; }
+ virtual const char* GetPackageTargetName() const { return "PACKAGE"; }
+ virtual const char* GetPackageSourceTargetName() const { return 0; }
+ virtual const char* GetEditCacheTargetName() const { return 0; }
+ virtual const char* GetRebuildCacheTargetName() const { return 0; }
+ virtual const char* GetCleanTargetName() const { return 0; }
// Class to track a set of dependencies.
typedef cmTargetDependSet TargetDependSet;
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index d21d5b9..7c6bbc2 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -137,17 +137,17 @@ protected:
bool NeedRequiresStep(cmTarget const&);
// Setup target names
- virtual const char* GetAllTargetName() { return "all"; }
- virtual const char* GetInstallTargetName() { return "install"; }
- virtual const char* GetInstallLocalTargetName() { return "install/local"; }
- virtual const char* GetInstallStripTargetName() { return "install/strip"; }
- virtual const char* GetPreinstallTargetName() { return "preinstall"; }
- virtual const char* GetTestTargetName() { return "test"; }
- virtual const char* GetPackageTargetName() { return "package"; }
- virtual const char* GetPackageSourceTargetName(){ return "package_source"; }
- virtual const char* GetEditCacheTargetName() { return "edit_cache"; }
- virtual const char* GetRebuildCacheTargetName() { return "rebuild_cache"; }
- virtual const char* GetCleanTargetName() { return "clean"; }
+ virtual const char* GetAllTargetName() const { return "all"; }
+ virtual const char* GetInstallTargetName() const { return "install"; }
+ virtual const char* GetInstallLocalTargetName() const { return "install/local"; }
+ virtual const char* GetInstallStripTargetName() const { return "install/strip"; }
+ virtual const char* GetPreinstallTargetName() const { return "preinstall"; }
+ virtual const char* GetTestTargetName() const { return "test"; }
+ virtual const char* GetPackageTargetName() const { return "package"; }
+ virtual const char* GetPackageSourceTargetName() const { return "package_source"; }
+ virtual const char* GetEditCacheTargetName() const { return "edit_cache"; }
+ virtual const char* GetRebuildCacheTargetName() const { return "rebuild_cache"; }
+ virtual const char* GetCleanTargetName() const { return "clean"; }
virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() { return true; }