From c655d7ecf9a000ced0eaa3e30ae918fc9af5bc89 Mon Sep 17 00:00:00 2001 From: Daniel Rosen Date: Fri, 13 Mar 2026 11:14:05 -0600 Subject: [PATCH] Include lib/CMAKE_LIBRARY_ARCHITECTURE in LibFind * supports apt installation for libraries /usr/lib/ * fix to PKGCOMP_FOUND --- cmake/LibFind.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/LibFind.cmake b/cmake/LibFind.cmake index 54ae2c878..9b6406640 100644 --- a/cmake/LibFind.cmake +++ b/cmake/LibFind.cmake @@ -254,7 +254,7 @@ function (find_package_component PKG) find_library (${PKGCOMP}_LIBRARY NAMES ${${PKGCOMP}_LIBRARY_NAMES} PATHS ${${PKGCOMP}_PREFIX} - PATH_SUFFIXES lib + PATH_SUFFIXES lib lib/${CMAKE_LIBRARY_ARCHITECTURE} NO_DEFAULT_PATH) # If found, check if library is static or dynamic @@ -266,7 +266,7 @@ function (find_package_component PKG) find_shared_library (${PKGCOMP}_SHARED_LIBRARY NAMES ${${PKGCOMP}_LIBRARY_NAMES} PATHS ${${PKGCOMP}_PREFIX} - PATH_SUFFIXES lib + PATH_SUFFIXES lib lib/${CMAKE_LIBRARY_ARCHITECTURE} NO_DEFAULT_PATH) if (${PKGCOMP}_SHARED_LIBRARY) set (${PKGCOMP}_LIBRARY ${${PKGCOMP}_SHARED_LIBRARY}) @@ -278,7 +278,7 @@ function (find_package_component PKG) find_static_library (${PKGCOMP}_STATIC_LIBRARY NAMES ${${PKGCOMP}_LIBRARY_NAMES} PATHS ${${PKGCOMP}_PREFIX} - PATH_SUFFIXES lib + PATH_SUFFIXES lib lib/${CMAKE_LIBRARY_ARCHITECTURE} NO_DEFAULT_PATH) if (${PKGCOMP}_STATIC_LIBRARY) set (${PKGCOMP}_LIBRARY ${${PKGCOMP}_STATIC_LIBRARY}) @@ -311,7 +311,9 @@ function (find_package_component PKG) mark_as_advanced (${PKGCOMP}_INCLUDE_DIR ${PKGCOMP}_LIBRARY) # HACK For bug in CMake v3.0: - set (${PKGCOMP}_FOUND ${${PKGCOMPUP}_FOUND}) + if (NOT DEFINED ${PKGCOMP}_FOUND AND DEFINED ${PKGCOMPUP}_FOUND) + set (${PKGCOMP}_FOUND ${${PKGCOMPUP}_FOUND}) + endif () # Set return variables if (${PKGCOMP}_FOUND)