diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-15 13:34:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-15 13:34:00 (GMT) |
| commit | d5d54b46299c65f0c5a80f973ad88a8dd30931c5 (patch) | |
| tree | a8c7006327a29c60eda654054e64465102116bf0 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 7fa77b3fb3d811f2661f19e0985c6eb2c8021468 (diff) | |
| parent | d7dd01083a99055d689c80fe28bbc79a11bf3da1 (diff) | |
| download | CMake-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/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 5 |
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")); |