Fix lib/ vs lib64/ issue with SUNDIALS config (AMICI-dev#2165)

Previously, the sundials cmake configuration wasn't found on systems that use lib64/ instead of lib/ Closes AMICI-dev#2143
m-philipps · Aug 24, 2023 · 260b4f6 · 260b4f6
1 parent 44ba054
commit 260b4f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -126,7 +126,7 @@ set(VENDORED_SUNDIALS_BUILD_DIR ${VENDORED_SUNDIALS_DIR}/build)
 set(VENDORED_SUNDIALS_INSTALL_DIR ${VENDORED_SUNDIALS_BUILD_DIR})
 set(SUNDIALS_PRIVATE_INCLUDE_DIRS "${VENDORED_SUNDIALS_DIR}/src")
 find_package(SUNDIALS REQUIRED PATHS
-             "${VENDORED_SUNDIALS_INSTALL_DIR}/lib/cmake/sundials/")
+             "${VENDORED_SUNDIALS_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/sundials/")
 message(STATUS "Found SUNDIALS: ${SUNDIALS_DIR}")
 
 set(GSL_LITE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/gsl")

diff --git a/cmake/AmiciConfig.cmake b/cmake/AmiciConfig.cmake
@@ -42,7 +42,7 @@ set_target_properties(SUNDIALS::KLU PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
                                                "${KLU_INCLUDE_DIR}")
 
 find_package(SUNDIALS REQUIRED PATHS
-             "@CMAKE_SOURCE_DIR@/ThirdParty/sundials/build/lib/cmake/sundials/")
+             "@CMAKE_SOURCE_DIR@/ThirdParty/sundials/build/@CMAKE_INSTALL_LIBDIR@/cmake/sundials/")
 
 if(@Boost_CHRONO_FOUND@)
   find_package(Boost COMPONENTS chrono REQUIRED)