summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-03-07 14:30:46 (GMT)
committerBrad King <brad.king@kitware.com>2017-03-07 14:30:46 (GMT)
commitac66dec5c5eb23f3daf515a50fece9af53fd1d6d (patch)
treee3485adee7ad3fdea9b75f4cff8b1eaebc933b30
parent6856c659efc46b1400e14a64cf98c71257e4b24f (diff)
parentbd8b5401cfb2088d5e5494d04236eda36278da8b (diff)
downloadCMake-ac66dec5c5eb23f3daf515a50fece9af53fd1d6d.zip
CMake-ac66dec5c5eb23f3daf515a50fece9af53fd1d6d.tar.gz
CMake-ac66dec5c5eb23f3daf515a50fece9af53fd1d6d.tar.bz2
Merge branch 'fix_csharp_custom_targets' into release
-rw-r--r--Source/cmGlobalVisualStudioGenerator.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index cc2536c..ced0c26 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -750,6 +750,10 @@ bool cmGlobalVisualStudioGenerator::TargetIsCSharpOnly(
if (!gt->GetConfigCommonSourceFiles(sources)) {
return false;
}
+ // Only "real" targets are allowed to be C# targets.
+ if (gt->Target->GetType() > cmStateEnums::OBJECT_LIBRARY) {
+ return false;
+ }
}
gt->GetLanguages(languages, "");
if (languages.size() == 1) {