Skip to content

GitLab

Unverified Commit 7d0ec0bc authored by Peter Eastman's avatar Peter Eastman Committed by GitHub
Browse files

TargetArch.cmake supports ARM Macs (#3421)

parent 6d483062
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
cmake_modules/TargetArch.cmake
View file @ 7d0ec0bc
...@@ -112,6 +112,8 @@ function(target_architecture output_var) ...@@ -112,6 +112,8 @@ function(target_architecture output_var)
foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES}) foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES})
if("${osx_arch}" STREQUAL "ppc" AND ppc_support) if("${osx_arch}" STREQUAL "ppc" AND ppc_support)
set(osx_arch_ppc TRUE) set(osx_arch_ppc TRUE)
elseif("${osx_arch}" STREQUAL "arm64")
set(osx_arch_arm64 TRUE)
elseif("${osx_arch}" STREQUAL "i386") elseif("${osx_arch}" STREQUAL "i386")
set(osx_arch_i386 TRUE) set(osx_arch_i386 TRUE)
elseif("${osx_arch}" STREQUAL "x86_64") elseif("${osx_arch}" STREQUAL "x86_64")
...@@ -128,6 +130,10 @@ function(target_architecture output_var) ...@@ -128,6 +130,10 @@ function(target_architecture output_var)
list(APPEND ARCH ppc) list(APPEND ARCH ppc)
endif() endif()
if(osx_arch_arm64)
list(APPEND ARCH arm64)
endif()
if(osx_arch_i386) if(osx_arch_i386)
list(APPEND ARCH i386) list(APPEND ARCH i386)
endif() endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment