summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.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/cmVisualStudio10TargetGenerator.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/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 50f195e..d59de11 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1337,8 +1337,9 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
clOptions.AddFlag("AssemblerListingLocation", asmLocation.c_str());
clOptions.Parse(flags.c_str());
clOptions.Parse(defineFlags.c_str());
- clOptions.AddDefines(this->Target->GetCompileDefinitions(
- configName.c_str()).c_str());
+ std::vector<std::string> targetDefines;
+ this->Target->GetCompileDefinitions(targetDefines, configName.c_str());
+ clOptions.AddDefines(targetDefines);
clOptions.SetVerboseMakefile(
this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));