VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-18 13:48:37 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2747 from df7cb/unwind-arm

Browse Source 
Fix libunwind detection on arm
This commit is contained in:
Edouard Griffiths
2026-06-06 12:14:27 +02:00
committed by GitHub
parent 77e39a017e f4aea9fae0
commit cdbb92e662
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+10 -10
View File
@@ -59,12 +59,12 @@ if(ENABLE_LIBUNWIND AND UNIX AND NOT ANDROID)
find_library(LIBUNWIND_LIB unwind)
if(LIBUNWIND_LIB)
set(LIBUNWIND_LIBRARIES ${LIBUNWIND_LIB})
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64|aarch64|arm64")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
find_library(LIBUNWIND_ARCH_LIB unwind-aarch64)
else()
find_library(LIBUNWIND_ARCH_LIB unwind-x86_64)
endif()
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()
@@ -77,14 +77,14 @@ if(ENABLE_LIBUNWIND AND UNIX AND NOT ANDROID)
if(NOT LIBUNWIND_LIBRARIES)
set(LIBUNWIND_LIBRARIES unwind)
endif()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64|aarch64|arm64")
list(JOIN LIBUNWIND_LIBRARIES ";" _libunwind_libs_joined)
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()
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()