VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-05-14 05:12:09 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2666 from FlUxIuS/master

Browse Source 
Replace the x86_64-only arch lib lookup with a multi-arch one adding ARM64
This commit is contained in:
Edouard Griffiths 2026-03-08 23:12:56 +01:00 committed by GitHub
commit cbc8929a89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -60,7 +60,11 @@ if(ENABLE_LIBUNWIND AND UNIX AND NOT ANDROID)
if(LIBUNWIND_LIB)
set(LIBUNWIND_LIBRARIES ${LIBUNWIND_LIB})
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
find_library(LIBUNWIND_ARCH_LIB unwind-aarch64)
else()
find_library(LIBUNWIND_ARCH_LIB unwind-x86_64)
endif()
if(LIBUNWIND_ARCH_LIB)
list(APPEND LIBUNWIND_LIBRARIES ${LIBUNWIND_ARCH_LIB})
endif()
@ -75,8 +79,12 @@ if(ENABLE_LIBUNWIND AND UNIX AND NOT ANDROID)
endif()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
list(JOIN LIBUNWIND_LIBRARIES ";" _libunwind_libs_joined)
if(NOT _libunwind_libs_joined MATCHES "unwind-x86_64")
if(NOT _libunwind_libs_joined MATCHES "unwind-x86_64" AND NOT _libunwind_libs_joined MATCHES "unwind-aarch64")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
find_library(LIBUNWIND_ARCH_LIB unwind-aarch64)
else()
find_library(LIBUNWIND_ARCH_LIB unwind-x86_64)
endif()
if(LIBUNWIND_ARCH_LIB)
list(APPEND LIBUNWIND_LIBRARIES ${LIBUNWIND_ARCH_LIB})
else()