mirror of
https://github.com/Z3Prover/z3
synced 2025-04-12 04:03:39 +00:00
dotnet: identifies arch-specific native libraries
This commit is contained in:
parent
3767c311aa
commit
4b3189f3e2
|
@ -140,6 +140,11 @@ endforeach()
|
||||||
# Note, nuget package file names do not have the ${VER_REV} part.
|
# Note, nuget package file names do not have the ${VER_REV} part.
|
||||||
|
|
||||||
set(Z3_DOTNET_NUPKG_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}")
|
set(Z3_DOTNET_NUPKG_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}")
|
||||||
|
if("${TARGET_ARCHITECTURE}" STREQUAL "i686")
|
||||||
|
set(Z3_DOTNET_PLATFORM "x86")
|
||||||
|
else()
|
||||||
|
set(Z3_DOTNET_PLATFORM "Any CPU")
|
||||||
|
endif()
|
||||||
|
|
||||||
# TODO conditional for signing. we can then enable the ``Release_delaysign`` configuration
|
# TODO conditional for signing. we can then enable the ``Release_delaysign`` configuration
|
||||||
|
|
||||||
|
|
|
@ -76,7 +76,7 @@ ${Z3_DOTNET_COMPILE_ITEMS}
|
||||||
<!-- TODO we may want to pack x64 and x86 native assemblies into a single nupkg -->
|
<!-- TODO we may want to pack x64 and x86 native assemblies into a single nupkg -->
|
||||||
|
|
||||||
<!-- Native binaries x64 -->
|
<!-- Native binaries x64 -->
|
||||||
<ItemGroup Condition="'$(Platform)' == 'x64'">
|
<ItemGroup Condition="'$(Platform)' != 'x86'">
|
||||||
<Content Include="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$(Configuration)/libz3.dll" Condition="Exists('${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$(Configuration)/libz3.dll')">
|
<Content Include="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$(Configuration)/libz3.dll" Condition="Exists('${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$(Configuration)/libz3.dll')">
|
||||||
<PackagePath>runtimes\win-x64\native</PackagePath>
|
<PackagePath>runtimes\win-x64\native</PackagePath>
|
||||||
</Content>
|
</Content>
|
||||||
|
|
|
@ -9,7 +9,8 @@
|
||||||
|
|
||||||
<!-- Probe the package root path -->
|
<!-- Probe the package root path -->
|
||||||
<Z3_PACKAGE_PATH Condition="('$(Z3_PACKAGE_PATH)' == '')">$(MSBuildThisFileDirectory)..\</Z3_PACKAGE_PATH>
|
<Z3_PACKAGE_PATH Condition="('$(Z3_PACKAGE_PATH)' == '')">$(MSBuildThisFileDirectory)..\</Z3_PACKAGE_PATH>
|
||||||
<Z3_NATIVE_LIB_PATH Condition="'$(IsWindows)' == 'true'">$(Z3_PACKAGE_PATH)runtimes\win-x64\native\libz3.dll</Z3_NATIVE_LIB_PATH>
|
<Z3_NATIVE_LIB_PATH Condition="'$(IsWindows)' == 'true' and '$(Platform)' != 'x86'">$(Z3_PACKAGE_PATH)runtimes\win-x64\native\libz3.dll</Z3_NATIVE_LIB_PATH>
|
||||||
|
<Z3_NATIVE_LIB_PATH Condition="'$(IsWindows)' == 'true' and '$(Platform)' == 'x86'">$(Z3_PACKAGE_PATH)runtimes\win-x86\native\libz3.dll</Z3_NATIVE_LIB_PATH>
|
||||||
<Z3_NATIVE_LIB_PATH Condition="'$(IsLinux)' == 'true'">$(Z3_PACKAGE_PATH)runtimes\linux-x64\native\libz3.so</Z3_NATIVE_LIB_PATH>
|
<Z3_NATIVE_LIB_PATH Condition="'$(IsLinux)' == 'true'">$(Z3_PACKAGE_PATH)runtimes\linux-x64\native\libz3.so</Z3_NATIVE_LIB_PATH>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue