Skip to content
Snippets Groups Projects
Commit ecfa0e06 authored by Dmitry Puzyrkov's avatar Dmitry Puzyrkov
Browse files

[+] allow to set MACOS_ARCH outside the build

parent 07403ada
No related branches found
No related tags found
1 merge request!1277[+] allow to set MACOS_ARCH outside the build
Pipeline #29875 passed with stage
in 9 minutes and 53 seconds
......@@ -67,12 +67,15 @@ if(UNIX)
if (${_CMAKE_OSX_SYSROOT_PATH} MATCHES "MacOS")
set(MACOS ON)
# on macOS "uname -m" returns the architecture (x86_64 or arm64)
execute_process(
COMMAND uname -m
RESULT_VARIABLE result
OUTPUT_VARIABLE MACOS_ARCH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if (NOT DEFINED MACOS_ARCH)
execute_process(
COMMAND uname -m
RESULT_VARIABLE result
OUTPUT_VARIABLE MACOS_ARCH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif()
add_definitions("-DDAP_OS_MAC -DDAP_OS_MAC_ARCH=${MACOS_ARCH}")
elseif (${_CMAKE_OSX_SYSROOT_PATH} MATCHES "iOS")
set(IOS ON)
......
Subproject commit 933f97479602d7b4be2c8fdbe6f6d2aea7dfc9b9
Subproject commit dd493a209579b92a9935d59c546ce276d0e653c4
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment