mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-09-18 07:00:43 +00:00
Code Issues Releases Wiki Activity

CMake: Improve architecture-aware search paths in CMake find modules

Browse Source
This commit is contained in:
Carles Fernandez
2026-04-20 17:19:24 +02:00
parent 8a46874780
commit 764a2c2839
3 changed files with 115 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Modules/FindGFORTRAN.cmake
+70 -47
View File
@@ -8,6 +8,10 @@ if(NOT COMMAND feature_summary)
include(FeatureSummary)
endif()
if(NOT CMAKE_INSTALL_LIBDIR)
include(GNUInstallDirs)
endif()
if(NOT DEFINED GNSSSDR_LIB_PATHS)
include(GnsssdrFindPaths)
endif()
@@ -23,59 +27,78 @@ if(DEFINED ENV{GFORTRAN_ROOT})
list(APPEND GFORTRAN_ROOT_USER_DEFINED "$ENV{GFORTRAN_ROOT}")
endif()
set(GCC_MAJOR_SERIES 16 15 14 13 12 11 10 9 8 7 6 5)
set(GFORTRAN_ARCH_PATHS)
list(APPEND GFORTRAN_ARCH_PATHS ${GFORTRAN_ROOT_USER_DEFINED})
if(CMAKE_LIBRARY_ARCHITECTURE)
list(APPEND GFORTRAN_ARCH_PATHS
"/usr/lib/gcc/${CMAKE_LIBRARY_ARCHITECTURE}"
"/usr/lib64/gcc/${CMAKE_LIBRARY_ARCHITECTURE}"
"/usr/local/lib/gcc/${CMAKE_LIBRARY_ARCHITECTURE}"
)
endif()
list(APPEND GFORTRAN_ARCH_PATHS
/usr/lib/gcc/x86_64-linux-gnu
/usr/lib/gcc/i386-linux-gnu
/usr/lib/gcc/i486-linux-gnu
/usr/lib/gcc/i586-linux-gnu
/usr/lib/gcc/i686-linux-gnu
/usr/lib/gcc/arm-linux-gnueabihf
/usr/lib/gcc/aarch64-linux-gnu
/usr/lib/gcc/arm-linux-gnueabi
/usr/lib/gcc/alpha-linux-gnu
/usr/lib/gcc/riscv64-linux-gnu
/usr/lib/gcc/hppa-linux-gnu
/usr/lib/gcc/m68k-linux-gnu
/usr/lib/gcc/i686-gnu
/usr/lib/gcc/x86_64-kfreebsd-gnu
/usr/lib/gcc/i686-kfreebsd-gnu
/usr/lib/gcc/mips-linux-gnu
/usr/lib/gcc/mips64el-linux-gnuabi64
/usr/lib/gcc/mipsel-linux-gnu
/usr/lib/gcc/powerpc-linux-gnu
/usr/lib/gcc/powerpc-linux-gnuspe
/usr/lib/gcc/powerpc64-linux-gnu
/usr/lib/gcc/powerpc64le-linux-gnu
/usr/lib/gcc/s390x-linux-gnu
/usr/lib/gcc/sparc64-linux-gnu
/usr/lib/gcc/x86_64-linux-gnux32
/usr/lib/gcc/sh4-linux-gnu
/usr/lib/gcc/i686-redhat-linux
/usr/lib64/gcc/x86_64-redhat-linux
/usr/lib/gcc/x86_64-redhat-linux
/usr/lib/gcc/armv7hl-redhat-linux-gnueabi
/usr/lib/gcc/aarch64-redhat-linux
/usr/lib/gcc/ppc64le-redhat-linux
/usr/lib/gcc/s390x-redhat-linux
/usr/lib64/gcc/x86_64-suse-linux
/usr/lib/gcc/i586-suse-linux
/usr/lib/gcc/x86_64-suse-linux
/usr/lib/gcc/armv6hl-suse-linux-gnueabi
/usr/lib/gcc/armv7hl-suse-linux-gnueabi
/usr/lib/gcc/loongarch64-linux-gnu
/usr/lib64/gcc/aarch64-suse-linux
/usr/lib64/gcc/powerpc64-suse-linux
/usr/lib64/gcc/powerpc64le-suse-linux
/usr/lib64/gcc/riscv64-suse-linux
/usr/lib64/gcc/s390x-suse-linux
${GNSSSDR_LIB_PATHS}
)
list(REMOVE_DUPLICATES GFORTRAN_ARCH_PATHS)
set(GCC_MAJOR_SERIES)
foreach(_gcc_major RANGE 5 30)
list(APPEND GCC_MAJOR_SERIES ${_gcc_major})
endforeach()
list(REVERSE GCC_MAJOR_SERIES)
set(GCC4_SERIES 4.9.1 4.9 4.8.3 4.8.2 4.8.1 4.8 4.7.2 4.7 4.6 4.5 4.4.4 4.4)
set(GCC_SERIES ${GCC_MAJOR_SERIES} ${GCC4_SERIES})
find_library(GFORTRAN
NAMES gfortran
PATHS
${GFORTRAN_ROOT_USER_DEFINED}
/usr/lib/gcc/x86_64-linux-gnu
/usr/lib/gcc/i386-linux-gnu
/usr/lib/gcc/i486-linux-gnu
/usr/lib/gcc/i586-linux-gnu
/usr/lib/gcc/i686-linux-gnu
/usr/lib/gcc/arm-linux-gnueabihf
/usr/lib/gcc/aarch64-linux-gnu
/usr/lib/gcc/arm-linux-gnueabi
/usr/lib/gcc/alpha-linux-gnu
/usr/lib/gcc/riscv64-linux-gnu
/usr/lib/gcc/hppa-linux-gnu
/usr/lib/gcc/m68k-linux-gnu
/usr/lib/gcc/i686-gnu
/usr/lib/gcc/x86_64-kfreebsd-gnu
/usr/lib/gcc/i686-kfreebsd-gnu
/usr/lib/gcc/mips-linux-gnu
/usr/lib/gcc/mips64el-linux-gnuabi64
/usr/lib/gcc/mipsel-linux-gnu
/usr/lib/gcc/powerpc-linux-gnu
/usr/lib/gcc/powerpc-linux-gnuspe
/usr/lib/gcc/powerpc64-linux-gnu
/usr/lib/gcc/powerpc64le-linux-gnu
/usr/lib/gcc/s390x-linux-gnu
/usr/lib/gcc/sparc64-linux-gnu
/usr/lib/gcc/x86_64-linux-gnux32
/usr/lib/gcc/sh4-linux-gnu
/usr/lib/gcc/i686-redhat-linux
/usr/lib64/gcc/x86_64-redhat-linux
/usr/lib/gcc/x86_64-redhat-linux
/usr/lib/gcc/armv7hl-redhat-linux-gnueabi
/usr/lib/gcc/aarch64-redhat-linux
/usr/lib/gcc/ppc64le-redhat-linux
/usr/lib/gcc/s390x-redhat-linux
/usr/lib64/gcc/x86_64-suse-linux
/usr/lib/gcc/i586-suse-linux
/usr/lib/gcc/x86_64-suse-linux
/usr/lib/gcc/armv6hl-suse-linux-gnueabi
/usr/lib/gcc/armv7hl-suse-linux-gnueabi
/usr/lib/gcc/loongarch64-linux-gnu
/usr/lib64/gcc/aarch64-suse-linux
/usr/lib64/gcc/powerpc64-suse-linux
/usr/lib64/gcc/powerpc64le-suse-linux
/usr/lib64/gcc/riscv64-suse-linux
/usr/lib64/gcc/s390x-suse-linux
${GNSSSDR_LIB_PATHS}
${GFORTRAN_ARCH_PATHS}
PATH_SUFFIXES
${GCC_SERIES}
)
cmake/Modules/GnsssdrFindPaths.cmake
+26 -7
View File
@@ -1,7 +1,7 @@
# GNSS-SDR is a Global Navigation Satellite System software-defined receiver.
# This file is part of GNSS-SDR.
#
# SPDX-FileCopyrightText: 2011-2025 C. Fernandez-Prades cfernandez(at)cttc.es
# SPDX-FileCopyrightText: 2011-2026 C. Fernandez-Prades cfernandez(at)cttc.es
# SPDX-License-Identifier: BSD-3-Clause
if(GNSSSDR_LIB_PATHS)
@@ -12,7 +12,16 @@ if(NOT CMAKE_INSTALL_LIBDIR)
include(GNUInstallDirs)
endif()
set(GNSSSDR_LIB_PATHS
set(GNSSSDR_LIB_PATHS)
if(CMAKE_LIBRARY_ARCHITECTURE)
list(APPEND GNSSSDR_LIB_PATHS
"/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}"
"/usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}"
)
endif()
list(APPEND GNSSSDR_LIB_PATHS
/usr/lib
/usr/lib64
/usr/lib/aarch64-linux-gnu
@@ -20,7 +29,6 @@ set(GNSSSDR_LIB_PATHS
/usr/lib/arm-linux-gnueabi
/usr/lib/arm-linux-gnueabihf
/usr/lib/hppa-linux-gnu
/usr/lib/hppa-linux-gnu
/usr/lib/i386-gnu
/usr/lib/i386-kfreebsd-gnu
/usr/lib/i386-linux-gnu
@@ -44,31 +52,40 @@ set(GNSSSDR_LIB_PATHS
/usr/local/lib64
/usr/local/lib/i386
${CMAKE_INSTALL_FULL_LIBDIR}
${CMAKE_SYSTEM_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib64
)
foreach(_gnsssdr_prefix ${CMAKE_SYSTEM_PREFIX_PATH})
list(APPEND GNSSSDR_LIB_PATHS "${_gnsssdr_prefix}/${CMAKE_INSTALL_LIBDIR}")
endforeach()
set(GNSSSDR_INCLUDE_PATHS
/usr/include
/usr/local/include
${CMAKE_INSTALL_FULL_INCLUDEDIR}
${CMAKE_SYSTEM_PREFIX_PATH}/include
${CMAKE_INSTALL_PREFIX}/include
)
foreach(_gnsssdr_prefix ${CMAKE_SYSTEM_PREFIX_PATH})
list(APPEND GNSSSDR_INCLUDE_PATHS "${_gnsssdr_prefix}/include")
endforeach()
set(GNSSSDR_BIN_PATHS
/usr/bin
/usr/local/bin
${CMAKE_INSTALL_PREFIX}/bin
${CMAKE_INSTALL_FULL_BINDIR}
${CMAKE_SYSTEM_PREFIX_PATH}/bin
/bin
/sbin
/usr/sbin
)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
foreach(_gnsssdr_prefix ${CMAKE_SYSTEM_PREFIX_PATH})
list(APPEND GNSSSDR_BIN_PATHS "${_gnsssdr_prefix}/bin")
endforeach()
if("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
if(NOT MACOS_PACKAGES_PREFIX)
include(DetectMacOSVersion)
endif()
@@ -91,3 +108,5 @@ endif()
list(REMOVE_DUPLICATES GNSSSDR_LIB_PATHS)
list(REMOVE_DUPLICATES GNSSSDR_INCLUDE_PATHS)
list(REMOVE_DUPLICATES GNSSSDR_BIN_PATHS)
unset(_gnsssdr_prefix)
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrFindPaths.cmake
+19 -5
View File
@@ -12,7 +12,16 @@ if(NOT CMAKE_INSTALL_LIBDIR)
include(GNUInstallDirs)
endif()
set(VOLK_GNSSSDR_LIB_PATHS
set(VOLK_GNSSSDR_LIB_PATHS)
if(CMAKE_LIBRARY_ARCHITECTURE)
list(APPEND VOLK_GNSSSDR_LIB_PATHS
"/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}"
"/usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}"
)
endif()
list(APPEND VOLK_GNSSSDR_LIB_PATHS
/usr/lib
/usr/lib64
/usr/lib/aarch64-linux-gnu
@@ -20,7 +29,6 @@ set(VOLK_GNSSSDR_LIB_PATHS
/usr/lib/arm-linux-gnueabi
/usr/lib/arm-linux-gnueabihf
/usr/lib/hppa-linux-gnu
/usr/lib/hppa-linux-gnu
/usr/lib/i386-gnu
/usr/lib/i386-kfreebsd-gnu
/usr/lib/i386-linux-gnu
@@ -44,20 +52,26 @@ set(VOLK_GNSSSDR_LIB_PATHS
/usr/local/lib64
/usr/local/lib/i386
${CMAKE_INSTALL_FULL_LIBDIR}
${CMAKE_SYSTEM_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib64
)
foreach(_volk_gnsssdr_prefix ${CMAKE_SYSTEM_PREFIX_PATH})
list(APPEND VOLK_GNSSSDR_LIB_PATHS "${_volk_gnsssdr_prefix}/${CMAKE_INSTALL_LIBDIR}")
endforeach()
set(VOLK_GNSSSDR_INCLUDE_PATHS
/usr/include
/usr/local/include
${CMAKE_INSTALL_FULL_INCLUDEDIR}
${CMAKE_SYSTEM_PREFIX_PATH}/include
${CMAKE_INSTALL_PREFIX}/include
)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
foreach(_volk_gnsssdr_prefix ${CMAKE_SYSTEM_PREFIX_PATH})
list(APPEND VOLK_GNSSSDR_INCLUDE_PATHS "${_volk_gnsssdr_prefix}/include")
endforeach()
if("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
if(NOT MACOS_PACKAGES_PREFIX)
include(DetectMacOSPackaging)
endif()