summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-07-15 13:34:00 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-07-15 13:34:00 (GMT)
commitd5d54b46299c65f0c5a80f973ad88a8dd30931c5 (patch)
treea8c7006327a29c60eda654054e64465102116bf0 /Source/cmLocalGenerator.h
parent7fa77b3fb3d811f2661f19e0985c6eb2c8021468 (diff)
parentd7dd01083a99055d689c80fe28bbc79a11bf3da1 (diff)
downloadCMake-d5d54b46299c65f0c5a80f973ad88a8dd30931c5.zip
CMake-d5d54b46299c65f0c5a80f973ad88a8dd30931c5.tar.gz
CMake-d5d54b46299c65f0c5a80f973ad88a8dd30931c5.tar.bz2
Merge topic 'compile-defs-debugging'
d7dd010 Add target property debugging for COMPILE_DEFINITIONS 1841215 Refactor cmTarget::GetCompileDefinitions to use an out-vector, not a string. afc9243 Add an overload of cmIDEOptions::AddDefines taking a vector of strings. d95651e Overload cmLocalGenerator::AppendDefines to add a list.
Diffstat (limited to 'Source/cmLocalGenerator.h')
-rw-r--r--Source/cmLocalGenerator.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index f35ef8e..5c644d1 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -166,6 +166,9 @@ public:
{
this->AppendDefines(defines, defines_list.c_str());
}
+ void AppendDefines(std::set<std::string>& defines,
+ const std::vector<std::string> &defines_vec);
+
/**
* Join a set of defines into a definesString with a space separator.
*/
@@ -220,6 +223,8 @@ public:
bool stripImplicitInclDirs = true);
void AddCompileOptions(std::string& flags, cmTarget* target,
const char* lang, const char* config);
+ void AddCompileDefinitions(std::set<std::string>& defines, cmTarget* target,
+ const char* config);
/** Compute the language used to compile the given source file. */
const char* GetSourceFileLanguage(const cmSourceFile& source);