Added changes for building on Windows on ARM64. (build from 'arm64 Na…

cmake/dotnet.cmake

@@ -47,7 +47,7 @@ set(DOTNET_PACKAGES_DIR "${PROJECT_BINARY_DIR}/dotnet/packages")
 
 # Runtime IDentifier
 # see: https://docs.microsoft.com/en-us/dotnet/core/rid-catalog
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)")
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|ARM64)")
   set(DOTNET_PLATFORM arm64)
 else()
   set(DOTNET_PLATFORM x64)

ortools/dotnet/Google.OrTools-full.csproj.in

@@ -3,7 +3,7 @@
     <OutputType>Library</OutputType>
     <LangVersion>@DOTNET_LANG@</LangVersion>
     @DOTNET_TFM@
-    <RuntimeIdentifiers>linux-x64;osx-x64;win-x64;linux-arm64;osx-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>linux-x64;osx-x64;win-x64;win-arm64;linux-arm64;osx-arm64</RuntimeIdentifiers>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyName>@DOTNET_PROJECT@</AssemblyName>
     <Version>@PROJECT_VERSION@</Version>
@@ -112,6 +112,7 @@
       <RuntimeLinuxX64 Include="@DOTNET_PACKAGES_DIR@/@DOTNET_PROJECT@.runtime.linux-x64.*.nupkg"/>
       <RuntimeOsxX64 Include="@DOTNET_PACKAGES_DIR@/@DOTNET_PROJECT@.runtime.osx-x64.*.nupkg"/>
       <RuntimeWinX64 Include="@DOTNET_PACKAGES_DIR@/@DOTNET_PROJECT@.runtime.win-x64.*.nupkg"/>
+      <RuntimeWinArm64 Include="@DOTNET_PACKAGES_DIR@/@DOTNET_PROJECT@.runtime.win-arm64.*.nupkg"/>
       <RuntimeLinuxArm64 Include="@DOTNET_PACKAGES_DIR@/@DOTNET_PROJECT@.runtime.linux-arm64.*.nupkg"/>
       <RuntimeOsxArm64 Include="@DOTNET_PACKAGES_DIR@/@DOTNET_PROJECT@.runtime.osx-arm64.*.nupkg"/>
     </ItemGroup>
@@ -122,11 +123,13 @@
     <Message Importance="high" Text="Package @DOTNET_PROJECT@.runtime.osx-x64: not found" Condition="!Exists('@(RuntimeOsxX64)')"/>
     <Message Importance="high" Text="Package @DOTNET_PROJECT@.runtime.win-x64: found" Condition="Exists('@(RuntimeWinX64)')"/>
     <Message Importance="high" Text="Package @DOTNET_PROJECT@.runtime.win-x64: not found" Condition="!Exists('@(RuntimeWinX64)')"/>
+    <Message Importance="high" Text="Package @DOTNET_PROJECT@.runtime.win-arm64: found" Condition="Exists('@(RuntimeWinArm64)')"/>
+    <Message Importance="high" Text="Package @DOTNET_PROJECT@.runtime.win-arm64: not found" Condition="!Exists('@(RuntimeWinArm64)')"/>
     <Message Importance="high" Text="Package @DOTNET_PROJECT@.runtime.linux-arm64: found" Condition="Exists('@(RuntimeLinuxArm64)')"/>
     <Message Importance="high" Text="Package @DOTNET_PROJECT@.runtime.linux-arm64: not found" Condition="!Exists('@(RuntimeLinuxArm64)')"/>
     <Message Importance="high" Text="Package @DOTNET_PROJECT@.runtime.osx-arm64: found" Condition="Exists('@(RuntimeOsxArm64)')"/>
     <Message Importance="high" Text="Package @DOTNET_PROJECT@.runtime.osx-arm64: not found" Condition="!Exists('@(RuntimeOsxArm64)')"/>
-    <Error Text="You must have locally all runtime packages." Condition="!Exists('@(RuntimeLinuxX64)') OR !Exists('@(RuntimeOsxX64)') OR !Exists('@(RuntimeWinX64)') OR !Exists('@(RuntimeLinuxArm64)') OR !Exists('@(RuntimeOsxArm64)')"/>
+    <Error Text="You must have locally all runtime packages." Condition="!Exists('@(RuntimeLinuxX64)') OR !Exists('@(RuntimeOsxX64)') OR !Exists('@(RuntimeWinX64)') OR !Exists('@(RuntimeWinArm64)') OR!Exists('@(RuntimeLinuxArm64)') OR !Exists('@(RuntimeOsxArm64)')"/>
   </Target>
 
   <!-- Copy all .proto file(s) -->
@@ -196,6 +199,7 @@
     <PackageReference Include="@DOTNET_PROJECT@.runtime.linux-x64" Version="@PROJECT_VERSION@"/>
     <PackageReference Include="@DOTNET_PROJECT@.runtime.osx-x64"   Version="@PROJECT_VERSION@"/>
     <PackageReference Include="@DOTNET_PROJECT@.runtime.win-x64"   Version="@PROJECT_VERSION@"/>
+    <PackageReference Include="@DOTNET_PROJECT@.runtime.win-arm64"   Version="@PROJECT_VERSION@"/>
     <PackageReference Include="@DOTNET_PROJECT@.runtime.linux-arm64" Version="@PROJECT_VERSION@"/>
     <PackageReference Include="@DOTNET_PROJECT@.runtime.osx-arm64"   Version="@PROJECT_VERSION@"/>
   </ItemGroup>

ortools/dotnet/Google.OrTools.sln

@@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 15.0.26124.0
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.OrTools.runtime.linux-x64", "Google.OrTools.runtime.linux-x64\Google.OrTools.runtime.linux-x64.csproj", "{FC646C34-8541-427D-B9F6-1247798F4574}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.OrTools.runtime.osx-x64",   "Google.OrTools.runtime.osx-x64\Google.OrTools.runtime.osx-x64.csproj", "{FC646C34-8541-427D-B9F6-1247798F4574}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.OrTools.runtime.win-x64",   "Google.OrTools.runtime.win-x64\Google.OrTools.runtime.win-x64.csproj", "{FC646C34-8541-427D-B9F6-1247798F4574}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.OrTools.runtime.win-arm64",   "Google.OrTools.runtime.win-arm64\Google.OrTools.runtime.win-arm64.csproj", "{FC646C34-8541-427D-B9F6-1247798F4574}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.OrTools",   "Google.OrTools\Google.OrTools.csproj", "{FC646C34-8541-427D-B9F6-1247798F4574}"
 EndProject
 Global

ortools/sat/python/cp_model.py

@@ -18,7 +18,7 @@
 
 * [`CpModel`](#cp_model.CpModel): Methods for creating
 models, including variables and constraints.
-* [`CPSolver`](#cp_model.CpSolver): Methods for solving
+* [`CpSolver`](#cp_model.CpSolver): Methods for solving
 a model and evaluating solutions.
 
 The following methods implement callbacks that the

patches/scip-v922.patch

@@ -176,4 +176,18 @@ index d6dd3acf..a146ddec 100644
 +)
  install(FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/scip-config.cmake"
                ${PROJECT_BINARY_DIR}/scip-config-version.cmake
-         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scip)
+         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scip)
+diff --git a/src/scip/intervalarith.c b/src/scip/intervalarith.c
+index 6d76d12e..7a0b0204 100644
+--- a/src/scip/intervalarith.c
++++ b/src/scip/intervalarith.c
+@@ -301,7 +301,7 @@ double negate(
+ /* cl or icl compiler on 32bit windows or icl compiler on 64bit windows
+  * cl on 64bit windows does not seem to support inline assembler
+  */
+-#elif defined(_MSC_VER) && (defined(__INTEL_COMPILER) || !defined(_M_X64))
++#elif defined(_MSC_VER) && (defined(__INTEL_COMPILER) || (!defined(_M_X64) && !defined(_M_ARM64)))
+
+ /** gets the negation of a double
+  * Do this in a way that the compiler does not "optimize" it away, which usually does not considers rounding modes.
+