diff --git a/cmake/dotnet.cmake b/cmake/dotnet.cmake index a0978c5b2d..8af15f0da6 100644 --- a/cmake/dotnet.cmake +++ b/cmake/dotnet.cmake @@ -44,25 +44,26 @@ endif() set(DOTNET_PACKAGE Google.OrTools) 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)") + set(DOTNET_PLATFORM arm64) +else() + set(DOTNET_PLATFORM x64) +endif() + if(APPLE) - if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)") - set(RUNTIME_IDENTIFIER osx-arm64) - else() - set(RUNTIME_IDENTIFIER osx-x64) - endif() + set(DOTNET_RID osx-${DOTNET_PLATFORM}) elseif(UNIX) - if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)") - set(RUNTIME_IDENTIFIER linux-arm64) - else() - set(RUNTIME_IDENTIFIER linux-x64) - endif() + set(DOTNET_RID linux-${DOTNET_PLATFORM}) elseif(WIN32) - set(RUNTIME_IDENTIFIER win-x64) + set(DOTNET_RID win-${DOTNET_PLATFORM}) else() message(FATAL_ERROR "Unsupported system !") endif() -set(DOTNET_NATIVE_PROJECT ${DOTNET_PACKAGE}.runtime.${RUNTIME_IDENTIFIER}) +message(STATUS ".Net RID: ${DOTNET_RID}") + +set(DOTNET_NATIVE_PROJECT ${DOTNET_PACKAGE}.runtime.${DOTNET_RID}) message(STATUS ".Net runtime project: ${DOTNET_NATIVE_PROJECT}") set(DOTNET_NATIVE_PROJECT_DIR ${PROJECT_BINARY_DIR}/dotnet/${DOTNET_NATIVE_PROJECT}) message(STATUS ".Net runtime project build path: ${DOTNET_NATIVE_PROJECT_DIR}") @@ -71,12 +72,6 @@ message(STATUS ".Net runtime project build path: ${DOTNET_NATIVE_PROJECT_DIR}") # see: https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/configure-language-version set(DOTNET_LANG "9.0") message(STATUS ".Net C# language version: ${DOTNET_LANG}") -# see: Platform -if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)") - set(DOTNET_PLATFORM arm64) -else() - set(DOTNET_PLATFORM x64) -endif() # see: https://docs.microsoft.com/en-us/dotnet/standard/frameworks if(USE_DOTNET_CORE_31 AND USE_DOTNET_6) diff --git a/ortools/dotnet/Google.OrTools-local.csproj.in b/ortools/dotnet/Google.OrTools-local.csproj.in index 25c053b7c7..1fafa6a936 100644 --- a/ortools/dotnet/Google.OrTools-local.csproj.in +++ b/ortools/dotnet/Google.OrTools-local.csproj.in @@ -3,7 +3,7 @@ Library @DOTNET_LANG@ @DOTNET_TFM@ - @RUNTIME_IDENTIFIER@ + @DOTNET_RID@ true @DOTNET_PROJECT@ @PROJECT_VERSION@ @@ -101,12 +101,12 @@ - + - - - + + + @@ -173,7 +173,7 @@ - + diff --git a/ortools/dotnet/Google.OrTools.runtime.csproj.in b/ortools/dotnet/Google.OrTools.runtime.csproj.in index 5cd5be36c0..ad6d3dba0c 100644 --- a/ortools/dotnet/Google.OrTools.runtime.csproj.in +++ b/ortools/dotnet/Google.OrTools.runtime.csproj.in @@ -2,7 +2,7 @@ Library @DOTNET_TFM@ - @RUNTIME_IDENTIFIER@ + @DOTNET_RID@ google-ortools-native @PROJECT_VERSION@ @@ -11,7 +11,7 @@ false - Google.OrTools @RUNTIME_IDENTIFIER@ v@PROJECT_VERSION@ + Google.OrTools @DOTNET_RID@ v@PROJECT_VERSION@ @DOTNET_NATIVE_PROJECT@ @@ -24,8 +24,11 @@ - - runtimes/@RUNTIME_IDENTIFIER@/native/%(Filename)%(Extension) + + runtimes/@DOTNET_RID@/native/%(Filename)%(Extension) true PreserveNewest