Skip to content

Include lib/CMAKE_LIBRARY_ARCHITECTURE in LibFind #2023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jedwards4b merged 2 commits into from
Mar 13, 2026
+6 −4
Merged

Include lib/CMAKE_LIBRARY_ARCHITECTURE in LibFind #2023

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c655d7e
Include lib/CMAKE_LIBRARY_ARCHITECTURE in LibFind
danrosen25 Mar 13, 2026
74d0d65
Merge branch 'main' into fix/libfind
jedwards4b Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions cmake/LibFind.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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})
Expand All @@ -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})
Expand Down Expand Up @@ -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)
Expand Down
Loading