From dcc4d25222d9ac93dc0783ad12355e539d115187 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@cttc.es>
Date: Wed, 16 Apr 2025 20:27:55 +0200
Subject: [PATCH] Fix suffixes usage in CMake modules

---
 cmake/Modules/AvoidAccelerate.cmake |  7 +++----
 cmake/Modules/FindGFLAGS.cmake      |  4 ++--
 cmake/Modules/FindGLOG.cmake        |  3 +--
 cmake/Modules/FindGOOGLETEST.cmake  | 13 ++++++-------
 cmake/Modules/FindPUGIXML.cmake     | 12 ++----------
 5 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/cmake/Modules/AvoidAccelerate.cmake b/cmake/Modules/AvoidAccelerate.cmake
index 27d9bd6b5..b3cb1071b 100644
--- a/cmake/Modules/AvoidAccelerate.cmake
+++ b/cmake/Modules/AvoidAccelerate.cmake
@@ -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
diff --git a/cmake/Modules/FindGFLAGS.cmake b/cmake/Modules/FindGFLAGS.cmake
index afc7ebb68..ca9cb736b 100644
--- a/cmake/Modules/FindGFLAGS.cmake
+++ b/cmake/Modules/FindGFLAGS.cmake
@@ -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
diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake
index ef7878a10..1884157bb 100644
--- a/cmake/Modules/FindGLOG.cmake
+++ b/cmake/Modules/FindGLOG.cmake
@@ -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()
 
diff --git a/cmake/Modules/FindGOOGLETEST.cmake b/cmake/Modules/FindGOOGLETEST.cmake
index 268d8580a..83ecc942a 100644
--- a/cmake/Modules/FindGOOGLETEST.cmake
+++ b/cmake/Modules/FindGOOGLETEST.cmake
@@ -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
diff --git a/cmake/Modules/FindPUGIXML.cmake b/cmake/Modules/FindPUGIXML.cmake
index 6c6b34a63..864e5c80a 100644
--- a/cmake/Modules/FindPUGIXML.cmake
+++ b/cmake/Modules/FindPUGIXML.cmake
@@ -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.