From 24182325860e058f59e2a01bbde92e735dd8357b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20St=C3=BCrmer?= Date: Fri, 13 Apr 2018 07:42:04 +0200 Subject: cmGeneratorTarget: change GetManagedType() result if language is CSharp --- Source/cmGeneratorTarget.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 0cb299c..bf5ff65 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -5530,7 +5530,9 @@ cmGeneratorTarget::ManagedType cmGeneratorTarget::GetManagedType( return this->CheckManagedType(clr); } - // TODO: need to check if target is a CSharp target here. - // If yes: return ManagedType::Managed. - return ManagedType::Native; + // C# targets are always managed. This language specific check + // is added to avoid that the COMMON_LANGUAGE_RUNTIME target property + // has to be set manually for C# targets. + return this->HasLanguage("CSharp", config) ? ManagedType::Managed + : ManagedType::Native; } -- cgit v0.12