diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-06 13:54:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-06 13:54:56 (GMT) |
| commit | e1ebec55d4b3e9db2c718064237707252ec4abf5 (patch) | |
| tree | 6c526cc47975e057eead5be65a9506e5ee3dd824 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 3ecbe1987d56b905853a5fae4f5664befed0e223 (diff) | |
| parent | 4d89830d7117a6fb68346d4ebe5f2f3c6d3223a0 (diff) | |
| download | CMake-e1ebec55d4b3e9db2c718064237707252ec4abf5.zip CMake-e1ebec55d4b3e9db2c718064237707252ec4abf5.tar.gz CMake-e1ebec55d4b3e9db2c718064237707252ec4abf5.tar.bz2 | |
Merge topic 'grd-stdstring'
4d89830d71 cmMakefile: Make GetRequiredDefinition return std::string
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2347
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 60edfbc..9e74335 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2471,7 +2471,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( baseFlagVar += "_FLAGS"; flags = this->Makefile->GetRequiredDefinition(baseFlagVar); std::string flagVar = - baseFlagVar + std::string("_") + cmSystemTools::UpperCase(configName); + baseFlagVar + "_" + cmSystemTools::UpperCase(configName); flags += " "; flags += this->Makefile->GetRequiredDefinition(flagVar); this->LocalGenerator->AddCompileOptions(flags, this->GeneratorTarget, |