diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-09-21 06:51:42 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-09-21 11:28:53 (GMT) |
| commit | 0ff4e3f0b88885eafab0693fdf03b44c7a5f9d0c (patch) | |
| tree | 86d6d179c804feeaa3bcfcc188400a7b09bc0e0e /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | f178d531a6a75b3cbdaa0a3dec5e0aa8daca7d24 (diff) | |
| download | CMake-0ff4e3f0b88885eafab0693fdf03b44c7a5f9d0c.zip CMake-0ff4e3f0b88885eafab0693fdf03b44c7a5f9d0c.tar.gz CMake-0ff4e3f0b88885eafab0693fdf03b44c7a5f9d0c.tar.bz2 | |
Port remaining code to GetCompileDefinitions().
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index fea117a..87312ae 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1225,21 +1225,15 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( flags += " "; flags += targetFlags; } - std::string configUpper = cmSystemTools::UpperCase(configName); - std::string defPropName = "COMPILE_DEFINITIONS_"; - defPropName += configUpper; - // Get preprocessor definitions for this directory. std::string defineFlags = this->Target->GetMakefile()->GetDefineFlags(); clOptions.FixExceptionHandlingDefault(); clOptions.AddFlag("PrecompiledHeader", "NotUsing"); clOptions.Parse(flags.c_str()); clOptions.Parse(defineFlags.c_str()); - clOptions.AddDefines - (this->Makefile->GetProperty("COMPILE_DEFINITIONS")); - clOptions.AddDefines(this->Target->GetProperty("COMPILE_DEFINITIONS")); - clOptions.AddDefines(this->Makefile->GetProperty(defPropName.c_str())); - clOptions.AddDefines(this->Target->GetProperty(defPropName.c_str())); + clOptions.AddDefines(this->GeneratorTarget->GetCompileDefinitions()); + clOptions.AddDefines(this->GeneratorTarget->GetCompileDefinitions( + configName.c_str())); clOptions.SetVerboseMakefile( this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE")); |