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

Make accessors for compile-related information const. 

These can be moved to cmGeneratorTarget in CMake 4.0.
This commit is contained in:
Stephen Kelly 2013-11-06 12:33:17 +01:00
parent 19a8a3c4c8
commit dcac9be6aa
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Source/cmTarget.cxx
View File

@ -138,16 +138,16 @@ public:
std::vector<TargetPropertyEntry*> CompileDefinitionsEntries; std::vector<TargetPropertyEntry*> CompileDefinitionsEntries;
std::vector<cmValueWithOrigin> LinkInterfacePropertyEntries; std::vector<cmValueWithOrigin> LinkInterfacePropertyEntries;
std::map<std::string, std::vector<TargetPropertyEntry*> > mutable std::map<std::string, std::vector<TargetPropertyEntry*> >
CachedLinkInterfaceIncludeDirectoriesEntries; CachedLinkInterfaceIncludeDirectoriesEntries;
std::map<std::string, std::vector<TargetPropertyEntry*> > mutable std::map<std::string, std::vector<TargetPropertyEntry*> >
CachedLinkInterfaceCompileOptionsEntries; CachedLinkInterfaceCompileOptionsEntries;
std::map<std::string, std::vector<TargetPropertyEntry*> > mutable std::map<std::string, std::vector<TargetPropertyEntry*> >
CachedLinkInterfaceCompileDefinitionsEntries; CachedLinkInterfaceCompileDefinitionsEntries;
std::map<std::string, bool> CacheLinkInterfaceIncludeDirectoriesDone; mutable std::map<std::string, bool> CacheLinkInterfaceIncludeDirectoriesDone;
std::map<std::string, bool> CacheLinkInterfaceCompileDefinitionsDone; mutable std::map<std::string, bool> CacheLinkInterfaceCompileDefinitionsDone;
std::map<std::string, bool> CacheLinkInterfaceCompileOptionsDone; mutable std::map<std::string, bool> CacheLinkInterfaceCompileOptionsDone;
}; };
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -1598,7 +1598,7 @@ void cmTarget::InsertCompileDefinition(const cmValueWithOrigin &entry,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
static void processIncludeDirectories(cmTarget *tgt, static void processIncludeDirectories(cmTarget const* tgt,
const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries, const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries,
std::vector<std::string> &includes, std::vector<std::string> &includes,
std::set<std::string> &uniqueIncludes, std::set<std::string> &uniqueIncludes,
@ -1767,7 +1767,8 @@ static void processIncludeDirectories(cmTarget *tgt,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config) std::vector<std::string>
cmTarget::GetIncludeDirectories(const char *config) const
{ {
std::vector<std::string> includes; std::vector<std::string> includes;
std::set<std::string> uniqueIncludes; std::set<std::string> uniqueIncludes;
@ -1899,7 +1900,7 @@ std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config)
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
static void processCompileOptionsInternal(cmTarget *tgt, static void processCompileOptionsInternal(cmTarget const* tgt,
const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries, const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries,
std::vector<std::string> &options, std::vector<std::string> &options,
std::set<std::string> &uniqueOptions, std::set<std::string> &uniqueOptions,
@ -1958,7 +1959,7 @@ static void processCompileOptionsInternal(cmTarget *tgt,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
static void processCompileOptions(cmTarget *tgt, static void processCompileOptions(cmTarget const* tgt,
const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries, const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries,
std::vector<std::string> &options, std::vector<std::string> &options,
std::set<std::string> &uniqueOptions, std::set<std::string> &uniqueOptions,
@ -1971,7 +1972,7 @@ static void processCompileOptions(cmTarget *tgt,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmTarget::GetCompileOptions(std::vector<std::string> &result, void cmTarget::GetCompileOptions(std::vector<std::string> &result,
const char *config) const char *config) const
{ {
std::set<std::string> uniqueOptions; std::set<std::string> uniqueOptions;
cmListFileBacktrace lfbt; cmListFileBacktrace lfbt;
@ -2070,7 +2071,7 @@ void cmTarget::GetCompileOptions(std::vector<std::string> &result,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
static void processCompileDefinitions(cmTarget *tgt, static void processCompileDefinitions(cmTarget const* tgt,
const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries, const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries,
std::vector<std::string> &options, std::vector<std::string> &options,
std::set<std::string> &uniqueOptions, std::set<std::string> &uniqueOptions,
@ -2084,7 +2085,7 @@ static void processCompileDefinitions(cmTarget *tgt,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmTarget::GetCompileDefinitions(std::vector<std::string> &list, void cmTarget::GetCompileDefinitions(std::vector<std::string> &list,
const char *config) const char *config) const
{ {
std::set<std::string> uniqueOptions; std::set<std::string> uniqueOptions;
cmListFileBacktrace lfbt; cmListFileBacktrace lfbt;

12
Source/cmTarget.h
View File

@ -445,7 +445,7 @@ public:
const char* GetExportMacro(); const char* GetExportMacro();
void GetCompileDefinitions(std::vector<std::string> &result, void GetCompileDefinitions(std::vector<std::string> &result,
const char *config); const char *config) const;
// Compute the set of languages compiled by the target. This is // Compute the set of languages compiled by the target. This is
// computed every time it is called because the languages can change // computed every time it is called because the languages can change
@ -512,7 +512,7 @@ public:
std::string GetAppBundleDirectory(const char* config, std::string GetAppBundleDirectory(const char* config,
bool contentOnly) const; bool contentOnly) const;
std::vector<std::string> GetIncludeDirectories(const char *config); std::vector<std::string> GetIncludeDirectories(const char *config) const;
void InsertInclude(const cmValueWithOrigin &entry, void InsertInclude(const cmValueWithOrigin &entry,
bool before = false); bool before = false);
void InsertCompileOption(const cmValueWithOrigin &entry, void InsertCompileOption(const cmValueWithOrigin &entry,
@ -523,7 +523,7 @@ public:
void AppendBuildInterfaceIncludes(); void AppendBuildInterfaceIncludes();
void GetCompileOptions(std::vector<std::string> &result, void GetCompileOptions(std::vector<std::string> &result,
const char *config); const char *config) const;
bool IsNullImpliedByLinkLibraries(const std::string &p) const; bool IsNullImpliedByLinkLibraries(const std::string &p) const;
bool IsLinkInterfaceDependentBoolProperty(const std::string &p, bool IsLinkInterfaceDependentBoolProperty(const std::string &p,
@ -679,9 +679,9 @@ private:
bool DLLPlatform; bool DLLPlatform;
bool IsApple; bool IsApple;
bool IsImportedTarget; bool IsImportedTarget;
bool DebugIncludesDone; mutable bool DebugIncludesDone;
bool DebugCompileOptionsDone; mutable bool DebugCompileOptionsDone;
bool DebugCompileDefinitionsDone; mutable bool DebugCompileDefinitionsDone;
mutable std::set<std::string> LinkImplicitNullProperties; mutable std::set<std::string> LinkImplicitNullProperties;
bool BuildInterfaceIncludesAppended; bool BuildInterfaceIncludesAppended;