summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.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/cmTarget.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/cmTarget.h')
-rw-r--r--Source/cmTarget.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 273f4e9..6d27d52 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -441,7 +441,8 @@ public:
If no macro should be defined null is returned. */
const char* GetExportMacro();
- std::string GetCompileDefinitions(const char *config);
+ void GetCompileDefinitions(std::vector<std::string> &result,
+ const char *config);
// Compute the set of languages compiled by the target. This is
// computed every time it is called because the languages can change
@@ -512,6 +513,8 @@ public:
bool before = false);
void InsertCompileOption(const cmValueWithOrigin &entry,
bool before = false);
+ void InsertCompileDefinition(const cmValueWithOrigin &entry,
+ bool before = false);
void AppendBuildInterfaceIncludes();
@@ -648,6 +651,7 @@ private:
bool IsImportedTarget;
bool DebugIncludesDone;
bool DebugCompileOptionsDone;
+ bool DebugCompileDefinitionsDone;
mutable std::set<std::string> LinkImplicitNullProperties;
bool BuildInterfaceIncludesAppended;