mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-10-31 23:26:22 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/seanstone/gnss-sdr into seanstone-next

Browse Source
This commit is contained in:
Carles Fernandez 2024-01-14 08:49:07 +01:00
commit 4191a3e851
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Modules/AvoidAccelerate.cmake
View File

@ -27,6 +27,7 @@ find_library(BLAS_LIBRARIES
/opt/local/lib/lapack /opt/local/lib/lapack
/opt/local/lib/ /opt/local/lib/
/usr/local/opt/lapack/lib /usr/local/opt/lapack/lib
/opt/homebrew/opt/lapack/lib
NO_DEFAULT_PATH NO_DEFAULT_PATH
NO_SYSTEM_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH
@ -47,6 +48,7 @@ find_library(LAPACK_LIBRARIES
${BLAS_ROOT_USER_DEFINED}/lapack ${BLAS_ROOT_USER_DEFINED}/lapack
/opt/local/lib/lapack /opt/local/lib/lapack
/usr/local/opt/lapack/lib /usr/local/opt/lapack/lib
/opt/homebrew/opt/lapack/lib
NO_DEFAULT_PATH NO_DEFAULT_PATH
NO_SYSTEM_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH

3
cmake/Modules/FindGFLAGS.cmake
View File

@ -44,6 +44,7 @@ if(APPLE)
${GFLAGS_ROOT_USER_PROVIDED}/lib ${GFLAGS_ROOT_USER_PROVIDED}/lib
/usr/local/lib /usr/local/lib
/opt/local/lib /opt/local/lib
/opt/homebrew/opt/gflags/lib
) )
else() else()
find_path(GFlags_ROOT_DIR find_path(GFlags_ROOT_DIR
@ -84,6 +85,7 @@ else()
endif() endif()
if(GFlags_ROOT_DIR) if(GFlags_ROOT_DIR)
unset(GFlags_INCLUDE_DIRS CACHE)
# We are testing only a couple of files in the include directories # We are testing only a couple of files in the include directories
find_path(GFlags_INCLUDE_DIRS find_path(GFlags_INCLUDE_DIRS
gflags/gflags.h gflags/gflags.h
@ -93,6 +95,7 @@ if(GFlags_ROOT_DIR)
/usr/include /usr/include
/usr/local/include /usr/local/include
/opt/local/include /opt/local/include
/opt/homebrew/opt/gflags/include
) )
# Find the libraries # Find the libraries

1
cmake/Modules/FindGLOG.cmake
View File

@ -109,6 +109,7 @@ else()
/usr/include/glog /usr/include/glog
/usr/local/include/glog /usr/local/include/glog
/opt/local/include/glog # default location in Macports /opt/local/include/glog # default location in Macports
/opt/homebrew/opt/glog/include/glog
${GLOG_ROOT}/include/glog ${GLOG_ROOT}/include/glog
) )
endif() endif()

2
cmake/Modules/FindGOOGLETEST.cmake
View File

@ -47,6 +47,7 @@ find_path(LIBGTEST_DEV_DIR
/usr/include/gtest /usr/include/gtest
/usr/local/src/googletest/googletest /usr/local/src/googletest/googletest
/opt/local/src/gtest-1.7.0 /opt/local/src/gtest-1.7.0
/opt/homebrew/opt/googletest/include/googletest/googletest
) )
find_path(GTEST_INCLUDE_DIRS find_path(GTEST_INCLUDE_DIRS
@ -57,6 +58,7 @@ find_path(GTEST_INCLUDE_DIRS
/usr/include /usr/include
/usr/local/include /usr/local/include
/opt/local/src/gtest-1.7.0/include /opt/local/src/gtest-1.7.0/include
/opt/homebrew/opt/googletest/include
) )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)