From 8ac648bebbbb0621d83689f66f7180ca33cf6534 Mon Sep 17 00:00:00 2001 From: "Andrew V. Jones" Date: Mon, 7 Feb 2022 17:10:56 +0000 Subject: [PATCH] Correct search location for CLN libs (#8070) On (e.g.,) openSUSE, the default install path (via CMake) for libraries is lib64 and not lib. However, FindCLN.cmake is hard-coded to only search in lib. This PR corrects FindCLN.cmake such that the build looks in ${CMAKE_INSTALL_LIBDIR} instead. Signed-off-by: Andrew V. Jones andrewvaughanj@gmail.com --- cmake/FindCLN.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/FindCLN.cmake b/cmake/FindCLN.cmake index b12c81685..8b6a7f865 100644 --- a/cmake/FindCLN.cmake +++ b/cmake/FindCLN.cmake @@ -64,17 +64,17 @@ if(NOT CLN_FOUND_SYSTEM) ${CMAKE_COMMAND} -E chdir autoreconf -iv COMMAND /configure --prefix= --enable-shared --enable-static --with-pic - BUILD_BYPRODUCTS /lib/libcln.a - /lib/libcln${CMAKE_SHARED_LIBRARY_SUFFIX} + BUILD_BYPRODUCTS /${CMAKE_INSTALL_LIBDIR}/libcln.a + /${CMAKE_INSTALL_LIBDIR}/libcln${CMAKE_SHARED_LIBRARY_SUFFIX} ) add_dependencies(CLN-EP GMP) set(CLN_INCLUDE_DIR "${DEPS_BASE}/include/") if(BUILD_SHARED_LIBS) - set(CLN_LIBRARIES "${DEPS_BASE}/lib/libcln${CMAKE_SHARED_LIBRARY_SUFFIX}") + set(CLN_LIBRARIES "${DEPS_BASE}/${CMAKE_INSTALL_LIBDIR}/libcln${CMAKE_SHARED_LIBRARY_SUFFIX}") else() - set(CLN_LIBRARIES "${DEPS_BASE}/lib/libcln.a") + set(CLN_LIBRARIES "${DEPS_BASE}/${CMAKE_INSTALL_LIBDIR}/libcln.a") endif() endif() -- 2.30.2