mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-14 00:52:04 +00:00
Add processor mapping for ARM64 -> DEPS_ARCH=arm64
With this change, builds on ARM64 hosts will successfully kick off! Unfortunately there are still missing/outdated dependencies, so the build doesn't yet succeed. This makes it much easier to check what we're failing on though.
This commit is contained in:
@@ -785,8 +785,10 @@ function(orcaslicer_copy_dlls target config postfix output_dlls)
|
|||||||
set(_arch "x64")
|
set(_arch "x64")
|
||||||
elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "X86")
|
elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "X86")
|
||||||
set(_arch "x86")
|
set(_arch "x86")
|
||||||
|
elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM64")
|
||||||
|
set(_arch "arm64")
|
||||||
else ()
|
else ()
|
||||||
message(FATAL_ERROR "Unable to detect architecture")
|
message(FATAL_ERROR "Unable to detect architecture: ${CMAKE_SYSTEM_PROCESSOR}")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
|
get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
|
||||||
|
|||||||
6
deps/CMakeLists.txt
vendored
6
deps/CMakeLists.txt
vendored
@@ -265,8 +265,12 @@ if (MSVC)
|
|||||||
message(STATUS "\nDetected X86 compiler => building X86 deps bundle\n")
|
message(STATUS "\nDetected X86 compiler => building X86 deps bundle\n")
|
||||||
set(DEPS_ARCH "x86")
|
set(DEPS_ARCH "x86")
|
||||||
include("deps-windows.cmake")
|
include("deps-windows.cmake")
|
||||||
|
elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM64")
|
||||||
|
message(STATUS "\nDetected ARM64 compiler => building ARM64 deps bundle\n")
|
||||||
|
set(DEPS_ARCH "arm64")
|
||||||
|
include("deps-windows.cmake")
|
||||||
else ()
|
else ()
|
||||||
message(FATAL_ERROR "Unable to detect architecture")
|
message(FATAL_ERROR "Unable to detect architecture: ${CMAKE_SYSTEM_PROCESSOR}")
|
||||||
endif ()
|
endif ()
|
||||||
elseif (APPLE)
|
elseif (APPLE)
|
||||||
message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}")
|
message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}")
|
||||||
|
|||||||
Reference in New Issue
Block a user