summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-06-06 16:13:35 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-07-11 06:23:56 (GMT)
commit184121538c2576b2113c0e256ecb0cd9ac354134 (patch)
tree20ed38bafe4ff886b00c0ff6160f45744465b3ac /Source/cmTarget.cxx
parentafc9243c325c37ac7364af12a10adffd7dd81d25 (diff)
downloadCMake-184121538c2576b2113c0e256ecb0cd9ac354134.zip
CMake-184121538c2576b2113c0e256ecb0cd9ac354134.tar.gz
CMake-184121538c2576b2113c0e256ecb0cd9ac354134.tar.bz2
Refactor cmTarget::GetCompileDefinitions to use an out-vector, not a string.
Refactor to create AddCompileDefinitions.
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r--Source/cmTarget.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index a90fa74..02dcf81 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3384,7 +3384,8 @@ void cmTarget::GetCompileOptions(std::vector<std::string> &result,
}
//----------------------------------------------------------------------------
-std::string cmTarget::GetCompileDefinitions(const char *config)
+void cmTarget::GetCompileDefinitions(std::vector<std::string> &list,
+ const char *config)
{
const char *configProp = 0;
if (config)
@@ -3419,7 +3420,8 @@ std::string cmTarget::GetCompileDefinitions(const char *config)
if (libs.empty())
{
- return result;
+ cmSystemTools::ExpandListArgument(result, list);
+ return;
}
std::string sep;
@@ -3467,7 +3469,7 @@ std::string cmTarget::GetCompileDefinitions(const char *config)
= true;
}
- return result;
+ cmSystemTools::ExpandListArgument(result, list);
}
//----------------------------------------------------------------------------