Skip to content

Commit 260b4f6

Browse files
authored
Fix lib/ vs lib64/ issue with SUNDIALS config (#2165)
Previously, the sundials cmake configuration wasn't found on systems that use lib64/ instead of lib/ Closes #2143
1 parent 44ba054 commit 260b4f6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ set(VENDORED_SUNDIALS_BUILD_DIR ${VENDORED_SUNDIALS_DIR}/build)
126126
set(VENDORED_SUNDIALS_INSTALL_DIR ${VENDORED_SUNDIALS_BUILD_DIR})
127127
set(SUNDIALS_PRIVATE_INCLUDE_DIRS "${VENDORED_SUNDIALS_DIR}/src")
128128
find_package(SUNDIALS REQUIRED PATHS
129-
"${VENDORED_SUNDIALS_INSTALL_DIR}/lib/cmake/sundials/")
129+
"${VENDORED_SUNDIALS_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/sundials/")
130130
message(STATUS "Found SUNDIALS: ${SUNDIALS_DIR}")
131131

132132
set(GSL_LITE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/gsl")

cmake/AmiciConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ set_target_properties(SUNDIALS::KLU PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
4242
"${KLU_INCLUDE_DIR}")
4343

4444
find_package(SUNDIALS REQUIRED PATHS
45-
"@CMAKE_SOURCE_DIR@/ThirdParty/sundials/build/lib/cmake/sundials/")
45+
"@CMAKE_SOURCE_DIR@/ThirdParty/sundials/build/@CMAKE_INSTALL_LIBDIR@/cmake/sundials/")
4646

4747
if(@Boost_CHRONO_FOUND@)
4848
find_package(Boost COMPONENTS chrono REQUIRED)

0 commit comments

Comments
 (0)