summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-17 16:05:57 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-01-17 16:06:04 (GMT)
commit9e3e93fc6f642e2cf0c1f11753ff8e2267d49ded (patch)
tree442246190661cfecc4423867229ce9827ca2ddd6 /Source/cmVisualStudio10TargetGenerator.cxx
parentc144db1b8ca1ea2e3dad397123f110956a439030 (diff)
parenta541d113e606b05073810bb1b5dd5a7a8fd2eec8 (diff)
downloadCMake-9e3e93fc6f642e2cf0c1f11753ff8e2267d49ded.zip
CMake-9e3e93fc6f642e2cf0c1f11753ff8e2267d49ded.tar.gz
CMake-9e3e93fc6f642e2cf0c1f11753ff8e2267d49ded.tar.bz2
Merge topic 'fix_csharp_defines'
a541d113e6 VS: Honor target_compile_definitions for C# projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2809
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index dd90269..8cb7939 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2620,6 +2620,10 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
}
clOptions.AddDefines(targetDefines);
+ if (this->ProjectType == csproj) {
+ clOptions.AppendFlag("DefineConstants", targetDefines);
+ }
+
// Get includes for this target
if (!this->LangForClCompile.empty()) {
clOptions.AddIncludes(