diff --git a/CMakeModules/DetectArchitecture.cmake b/CMakeModules/DetectArchitecture.cmake index d914ac4f84..c5d7577840 100644 --- a/CMakeModules/DetectArchitecture.cmake +++ b/CMakeModules/DetectArchitecture.cmake @@ -40,19 +40,20 @@ if (CMAKE_OSX_ARCHITECTURES) return() endif() -macro(detect_architecture symbol arch) +function(detect_architecture symbol arch) if (NOT DEFINED ARCHITECTURE) set(CMAKE_REQUIRED_QUIET 1) check_symbol_exists("${symbol}" "" ARCHITECTURE_${arch}) unset(CMAKE_REQUIRED_QUIET) if (ARCHITECTURE_${arch}) + message(STATUS "Found architecture symbol ${symbol} for ${arch}") set(ARCHITECTURE "${arch}" PARENT_SCOPE) set(ARCHITECTURE_${arch} 1 PARENT_SCOPE) add_definitions(-DARCHITECTURE_${arch}=1) endif() endif() -endmacro() +endfunction() function(DetectArchitecture) detect_architecture("__ARM64__" arm64) @@ -103,4 +104,6 @@ function(DetectArchitecture) endif() message(STATUS "[DetectArchitecture] Target architecture(s): ${ARCHITECTURE}") + set(ARCHITECTURE "${ARCHITECTURE}" PARENT_SCOPE) + set(ARCHITECTURE_${ARCHITECTURE} 1 PARENT_SCOPE) endfunction()