summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2012-09-20 21:25:27 (GMT)
committerStephen Kelly <steveire@gmail.com>2012-09-21 11:28:54 (GMT)
commit2c2b25b203e653326c0f4064649da06a8cdfd7a5 (patch)
tree1b240dfbc8bc5e573495d183b2600026850a65aa /Source/cmVisualStudio10TargetGenerator.cxx
parentb7e48e0acbd0cd30f803ec8c2d402c636beba778 (diff)
downloadCMake-2c2b25b203e653326c0f4064649da06a8cdfd7a5.zip
CMake-2c2b25b203e653326c0f4064649da06a8cdfd7a5.tar.gz
CMake-2c2b25b203e653326c0f4064649da06a8cdfd7a5.tar.bz2
Return a std::string from GetCompileDefinitions.
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 87312ae..90718ab 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1231,9 +1231,10 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
clOptions.AddFlag("PrecompiledHeader", "NotUsing");
clOptions.Parse(flags.c_str());
clOptions.Parse(defineFlags.c_str());
- clOptions.AddDefines(this->GeneratorTarget->GetCompileDefinitions());
+ clOptions.AddDefines(
+ this->GeneratorTarget->GetCompileDefinitions().c_str());
clOptions.AddDefines(this->GeneratorTarget->GetCompileDefinitions(
- configName.c_str()));
+ configName.c_str()).c_str());
clOptions.SetVerboseMakefile(
this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"));