1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-05-31 05:34:11 +00:00

Fix suffixes usage in CMake modules

This commit is contained in:
Carles Fernandez 2025-04-16 20:27:55 +02:00
parent 2e2987f131
commit dcc4d25222
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
5 changed files with 14 additions and 25 deletions

View File

@ -27,11 +27,10 @@ find_library(BLAS_LIBRARIES
NAMES libblas.dylib libopenblas.dylib
PATHS
${BLAS_ROOT_USER_DEFINED}
${BLAS_ROOT_USER_DEFINED}/lapack
${GNSSSDR_LIB_PATHS}/lapack
${GNSSSDR_LIB_PATHS}
/usr/local/opt/lapack/lib
/opt/homebrew/opt/lapack/lib
PATH_SUFFIXES lapack
NO_DEFAULT_PATH
NO_SYSTEM_ENVIRONMENT_PATH
NO_CMAKE_ENVIRONMENT_PATH
@ -49,10 +48,10 @@ find_library(LAPACK_LIBRARIES
liblapack.dylib
PATHS
${BLAS_ROOT_USER_DEFINED}
${BLAS_ROOT_USER_DEFINED}/lapack
${GNSSSDR_LIB_PATHS}/lapack
${GNSSSDR_LIB_PATHS}
/usr/local/opt/lapack/lib
/opt/homebrew/opt/lapack/lib
PATH_SUFFIXES lapack
NO_DEFAULT_PATH
NO_SYSTEM_ENVIRONMENT_PATH
NO_CMAKE_ENVIRONMENT_PATH

View File

@ -47,7 +47,7 @@ if(APPLE)
PATHS
${GFLAGS_ROOT_USER_PROVIDED}/lib
${GNSSSDR_LIB_PATHS}
${GNSSSDR_LIB_PATHS}/opt/gflags/lib
PATH_SUFFIXES opt/gflags/lib
)
else()
find_path(GFlags_ROOT_DIR
@ -68,7 +68,7 @@ if(GFlags_ROOT_DIR)
${GFlags_ROOT_DIR}/src
${GFLAGS_ROOT_USER_PROVIDED}/include
${GNSSSDR_INCLUDE_PATHS}
${GNSSSDR_INCLUDE_PATHS}/opt/gflags/include
PATH_SUFFIXES opt/gflags/include
)
# Find the libraries

View File

@ -83,9 +83,8 @@ else()
${PC_GLOG_INCLUDEDIR}
PATHS
${GNSSSDR_INCLUDE_PATHS}
${GNSSSDR_INCLUDE_PATHS}/opt/glog/include
${GLOG_ROOT}/include
PATH_SUFFIXES glog
PATH_SUFFIXES glog opt/glog/include
)
endif()

View File

@ -45,14 +45,13 @@ find_path(LIBGTEST_DEV_DIR
NAMES src/gtest-all.cc
PATHS
${GTEST_DIR_USER_PROVIDED}
${GTEST_DIR_USER_PROVIDED}/googletest
/usr/src/googletest/googletest
/usr/src/gtest
${GNSSSDR_INCLUDE_PATHS}/gtest
${GNSSSDR_INCLUDE_PATHS}/googletest
${CMAKE_SYSTEM_PREFIX_PATH}/src/googletest/googletest
/usr/src/googletest/
/usr/src
${GNSSSDR_INCLUDE_PATHS}
${CMAKE_SYSTEM_PREFIX_PATH}/src/googletest
${CMAKE_SYSTEM_PREFIX_PATH}/src/gtest-1.7.0
${CMAKE_SYSTEM_PREFIX_PATH}/opt/googletest/include/googletest/googletest
${CMAKE_SYSTEM_PREFIX_PATH}/opt/googletest/include/googletest
PATH_SUFFIXES gtest googletest
)
find_path(GTEST_INCLUDE_DIRS

View File

@ -52,11 +52,8 @@ find_path(PUGIXML_INCLUDE_DIR
NAMES pugixml.hpp
HINTS ${PC_PUGIXML_INCLUDEDIR}
PATHS ${PUGIXML_ROOT_USER_DEFINED}/include
${PUGIXML_ROOT_USER_DEFINED}/include/pugixml-${PC_PUGIXML_VERSION}
${PUGIXML_ROOT_USER_DEFINED}/include/pugixml-1.9
${GNSSSDR_INCLUDE_PATHS}
${GNSSSDR_INCLUDE_PATHS}/pugixml-${PC_PUGIXML_VERSION}
${GNSSSDR_INCLUDE_PATHS}/pugixml-1.9
PATH_SUFFIXES pugixml-${PC_PUGIXML_VERSION} pugixml-1.9
)
find_library(PUGIXML_LIBRARY
@ -64,13 +61,8 @@ find_library(PUGIXML_LIBRARY
HINTS ${PC_PUGIXML_LIBDIR}
PATHS ${PUGIXML_ROOT_USER_DEFINED}/lib
${PUGIXML_ROOT_USER_DEFINED}/lib64
${PUGIXML_ROOT_USER_DEFINED}/lib/pugixml-${PC_PUGIXML_VERSION}
${PUGIXML_ROOT_USER_DEFINED}/lib64/pugixml-${PC_PUGIXML_VERSION}
${PUGIXML_ROOT_USER_DEFINED}}/lib/pugixml-1.9
${PUGIXML_ROOT_USER_DEFINED}/lib64/pugixml-1.9
${GNSSSDR_LIB_PATHS}
${GNSSSDR_LIB_PATHS}/pugixml-${PC_PUGIXML_VERSION}
${GNSSSDR_LIB_PATHS}/pugixml-1.9
PATH_SUFFIXES pugixml-${PC_PUGIXML_VERSION} pugixml-1.9
)
# Support the REQUIRED and QUIET arguments, and set PUGIXML_FOUND if found.