From: Zoltan Varga <vargaz@gmail.com>
Date: Wed, 21 Oct 2020 08:58:48 +0000 (-0400)
Subject: Mono: Fix the windows cmake build. (#43658)
X-Git-Tag: submit/tizen/20210909.063632~4998
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c854456ede5139c4eabf21a8a76fe7ef1cedcb7;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Mono: Fix the windows cmake build. (#43658)

This will not use cmake on windows, it just fixes the conditionals so the windows build doesn't fail if cmake is enabled by default.
---

diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index 1377c55..210352a 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -6,8 +6,7 @@
   -->
 
   <PropertyGroup>
-    <!--<MonoEnableCMake Condition="'$(TargetsBrowser)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetsAndroid)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'">true</MonoEnableCMake>-->
-    <MonoEnableCMake Condition="'$(TargetsWindows)' != 'true'">true</MonoEnableCMake>
+    <MonoEnableCMake>true</MonoEnableCMake>
     <MonoCrossDir Condition="'$(MonoCrossDir)' == '' and '$(ROOTFS_DIR)' != ''">$(ROOTFS_DIR)</MonoCrossDir>
     <MonoEnableInterpreter Condition="'$(MonoEnableInterpreter)' == ''">false</MonoEnableInterpreter>
     <ScriptExt Condition="'$(OS)' == 'Windows_NT'">.cmd</ScriptExt>
@@ -785,7 +784,7 @@
   </Target>
 
   <!-- Windows Mono runtime build -->
-  <Target Name="BuildMonoRuntimeWindows" Condition="'$(OS)' == 'Windows_NT' and '$(MonoEnableCMake)' != 'true'">
+  <Target Name="BuildMonoRuntimeWindows" Condition="'$(OS)' == 'Windows_NT'">
 
     <!-- Sanity checks -->
     <Error Condition="'$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" Text="Error: Mono runtime for $(TargetOS) can't be built on Windows." />
@@ -852,7 +851,7 @@
     <Exec Condition="'$(OS)' != 'Windows_NT'" Command="$(MonoProjectRoot)../tests/run.sh $(CoreClrTestConfig)" ContinueOnError="ErrorAndContinue" />
   </Target>
 
-  <Target Name="BuildMonoRuntimeCMake" Condition="'$(MonoEnableCMake)' == 'true'">
+  <Target Name="BuildMonoRuntimeCMake" Condition="'$(OS)' != 'Windows_NT' and '$(MonoEnableCMake)' == 'true'">
     <Exec Command="which ninja" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true">
       <Output TaskParameter="ExitCode" PropertyName="MonoNinjaFound"/>
     </Exec>