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

cmLocalGenerator: Constify AppendDefines and AddCompileDefinitions

Browse Source
This commit is contained in:
Brad King 2016-06-10 09:23:14 -04:00
parent 98aafb2ad6
commit 853b1bb4ba
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmLocalGenerator.cxx
View File

@ -943,7 +943,7 @@ std::string cmLocalGenerator::GetIncludeFlags(
void cmLocalGenerator::AddCompileDefinitions(std::set<std::string>& defines, void cmLocalGenerator::AddCompileDefinitions(std::set<std::string>& defines,
cmGeneratorTarget const* target, cmGeneratorTarget const* target,
const std::string& config, const std::string& config,
const std::string& lang) const std::string& lang) const
{ {
std::vector<std::string> targetDefines; std::vector<std::string> targetDefines;
target->GetCompileDefinitions(targetDefines, config, lang); target->GetCompileDefinitions(targetDefines, config, lang);
@ -2051,7 +2051,7 @@ void cmLocalGenerator::AppendFlagEscape(std::string& flags,
} }
void cmLocalGenerator::AppendDefines(std::set<std::string>& defines, void cmLocalGenerator::AppendDefines(std::set<std::string>& defines,
const char* defines_list) const char* defines_list) const
{ {
// Short-circuit if there are no definitions. // Short-circuit if there are no definitions.
if (!defines_list) { if (!defines_list) {
@ -2065,7 +2065,8 @@ void cmLocalGenerator::AppendDefines(std::set<std::string>& defines,
} }
void cmLocalGenerator::AppendDefines( void cmLocalGenerator::AppendDefines(
std::set<std::string>& defines, const std::vector<std::string>& defines_vec) std::set<std::string>& defines,
const std::vector<std::string>& defines_vec) const
{ {
for (std::vector<std::string>::const_iterator di = defines_vec.begin(); for (std::vector<std::string>::const_iterator di = defines_vec.begin();
di != defines_vec.end(); ++di) { di != defines_vec.end(); ++di) {

10
Source/cmLocalGenerator.h
View File

@ -138,13 +138,15 @@ public:
* Encode a list of preprocessor definitions for the compiler * Encode a list of preprocessor definitions for the compiler
* command line. * command line.
*/ */
void AppendDefines(std::set<std::string>& defines, const char* defines_list); void AppendDefines(std::set<std::string>& defines,
void AppendDefines(std::set<std::string>& defines, std::string defines_list) const char* defines_list) const;
void AppendDefines(std::set<std::string>& defines,
std::string defines_list) const
{ {
this->AppendDefines(defines, defines_list.c_str()); this->AppendDefines(defines, defines_list.c_str());
} }
void AppendDefines(std::set<std::string>& defines, void AppendDefines(std::set<std::string>& defines,
const std::vector<std::string>& defines_vec); const std::vector<std::string>& defines_vec) const;
/** /**
* Join a set of defines into a definesString with a space separator. * Join a set of defines into a definesString with a space separator.
@ -200,7 +202,7 @@ public:
void AddCompileDefinitions(std::set<std::string>& defines, void AddCompileDefinitions(std::set<std::string>& defines,
cmGeneratorTarget const* target, cmGeneratorTarget const* target,
const std::string& config, const std::string& config,
const std::string& lang); const std::string& lang) const;
std::string GetProjectName() const; std::string GetProjectName() const;