Skip to content

Commit e629d35

Browse files
committed
..
1 parent 9351c75 commit e629d35

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ endif()
124124
include(GNUInstallDirs)
125125

126126
include(AmiciFindBLAS)
127-
find_package(OpenMP)
127+
find_package(OpenMP COMPONENTS CXX)
128128
find_package(Boost COMPONENTS chrono)
129129

130130
if(ENABLE_HDF5)
@@ -284,7 +284,7 @@ target_link_libraries(
284284
SUNDIALS::cvodes_static
285285
SUNDIALS::idas_static
286286
$<$<BOOL:${Boost_CHRONO_FOUND}>:Boost::chrono>
287-
$<$<BOOL:${OpenMP_FOUND}>:OpenMP::OpenMP_CXX>
287+
$<$<BOOL:${OpenMP_CXX_FOUND}>:OpenMP::OpenMP_CXX>
288288
${CMAKE_DL_LIBS}
289289
PRIVATE
290290
BLAS::BLAS

cmake/AmiciConfig.cmake.in

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,19 @@ list(APPEND CMAKE_PREFIX_PATH
1111
set(AMICI_BLAS_USE_SCIPY_OPENBLAS @AMICI_BLAS_USE_SCIPY_OPENBLAS@)
1212
include("${CMAKE_CURRENT_LIST_DIR}/AmiciFindBLAS.cmake")
1313

14-
find_package(OpenMP)
14+
if(@OpenMP_CXX_FOUND@)
15+
find_package(OpenMP COMPONENTS CXX)
16+
if (NOT OpenMP_CXX_FOUND)
17+
# Fall back to what was found by the main project
18+
set(OpenMP_CXX_FLAGS @OpenMP_CXX_FLAGS@)
19+
set(OpenMP_CXX_LIB_NAMES @OpenMP_CXX_LIB_NAMES@)
20+
set(OpenMP_CXX_FOUND TRUE)
21+
add_library(OpenMP::OpenMP_CXX UNKNOWN IMPORTED)
22+
set_target_properties(OpenMP::OpenMP_CXX PROPERTIES
23+
INTERFACE_COMPILE_OPTIONS "${OpenMP_CXX_FLAGS}"
24+
INTERFACE_LINK_LIBRARIES "${OpenMP_CXX_LIB_NAMES}")
25+
endif()
26+
endif()
1527

1628
find_dependency(SUNDIALS REQUIRED PATHS
1729
"@CMAKE_SOURCE_DIR@/ThirdParty/sundials/build/@CMAKE_INSTALL_LIBDIR@/cmake/sundials/")

0 commit comments

Comments
 (0)