Skip to content

Commit 3685e44

Browse files
Merge pull request #1786 from arcaneframework/dev/gg-improve-arccore-configuration
Improve Arccore configuration
2 parents ecbbd3e + b036145 commit 3685e44

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

arccore/src/concurrency/arccore/concurrency/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ endif()
3737

3838
target_link_libraries(arccore_concurrency PUBLIC arccore_base)
3939

40+
find_package(Threads)
41+
if (TARGET Threads::Threads)
42+
target_link_libraries(arccore_concurrency PRIVATE Threads::Threads)
43+
endif()
44+
4045
# ----------------------------------------------------------------------------
4146
# Local Variables:
4247
# tab-width: 2

arccore/src/message_passing_mpi/arccore/message_passing_mpi/CMakeLists.txt

+9-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ endif()
88

99
# On a besoin du support de MPI 3.1
1010
if (NOT WIN32)
11-
if (MPI_CXX_VERSION VERSION_LESS "3.1")
12-
message(FATAL_ERROR "MPI Version (${MPI_CXX_VERSION}) is too old. Version 3.1 is required."
13-
" Add -DARCCORE_USE_MPI=NO to cmake configuration to compile without MPI."
14-
)
11+
if (MPI_CXX_VERSION)
12+
if (MPI_CXX_VERSION VERSION_LESS "3.1")
13+
message(FATAL_ERROR "MPI Version (${MPI_CXX_VERSION}) is too old. Version 3.1 is required."
14+
" Add -DARCCORE_USE_MPI=NO to cmake configuration to compile without MPI."
15+
)
16+
endif()
1517
endif()
1618
endif()
1719

@@ -50,3 +52,6 @@ arccore_add_component_library(message_passing_mpi
5052

5153
target_link_libraries(arccore_message_passing_mpi PUBLIC arccore_trace arccore_message_passing arccore_collections arccore_concurrency)
5254
target_link_libraries(arccore_message_passing_mpi PUBLIC arcconpkg_MPI)
55+
if (ARCCORE_ADDITIONAL_MPI_LIBRARIES)
56+
target_link_libraries(arccore_message_passing_mpi PUBLIC ${ARCCORE_ADDITIONAL_MPI_LIBRARIES})
57+
endif()

0 commit comments

Comments
 (0)