diff --git a/cmake/OS_Detection.cmake b/cmake/OS_Detection.cmake index ca52af1043fc5ea8061a33057a3cb77e499dd65c..f0ea578a90987b955e70864a38d7f2f5c7f2f1c3 100644 --- a/cmake/OS_Detection.cmake +++ b/cmake/OS_Detection.cmake @@ -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) diff --git a/dap-sdk b/dap-sdk index 933f97479602d7b4be2c8fdbe6f6d2aea7dfc9b9..dd493a209579b92a9935d59c546ce276d0e653c4 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 933f97479602d7b4be2c8fdbe6f6d2aea7dfc9b9 +Subproject commit dd493a209579b92a9935d59c546ce276d0e653c4