diff options
author | Brad King <brad.king@kitware.com> | 2020-01-27 15:03:18 +0000 |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-27 10:03:26 -0500 |
commit | 0bf9589bf16070e59f0e8bfc5bedac71d3045634 (patch) | |
tree | 9c7c8fa495087c54b721cc0a543393cbda69e7d9 /Source | |
parent | fd6c1d99e3f678044c3cd1b5a6da808ecce825c2 (diff) | |
parent | effd4d05694382598675913b957dda2e08aa7392 (diff) | |
download | cmake-0bf9589bf16070e59f0e8bfc5bedac71d3045634.tar.gz |
Merge topic 'csharp-no-valued-macros'
effd4d0569 CSharp: Do not pass definitions with values
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4267
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index fd94bc93bf..6761c64802 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -6,6 +6,7 @@ #include <set> #include <cm/memory> +#include <cm/vector> #include "windows.h" @@ -2811,6 +2812,9 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( case csproj: this->GeneratorTarget->GetCompileDefinitions(targetDefines, configName, "CSharp"); + cm::erase_if(targetDefines, [](std::string const& def) { + return def.find('=') != std::string::npos; + }); break; } clOptions.AddDefines(targetDefines); |