Skip to content

Commit 1f53a5f

Browse files
authored
Merge pull request #1 from LIHPC-Computational-Geometry/complement_8.2.0
Gestion externe de MachineTypes.
2 parents 38399d9 + e1a40df commit 1f53a5f

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

src/Lima/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,13 @@ if (REAL_8)
6969
else (REAL_8)
7070
list (APPEND LIMA_CFLAGS -DREAL_32)
7171
endif (REAL_8)
72-
# EXPURGE_BEGINNING_TAG USE_LOCAL_DEPENDENCY_2
73-
# EXPURGE_COMPLETION_TAG
72+
73+
set (MachineTypes_ENABLED OFF)
74+
if (${MachineTypes_FOUND})
75+
message (STATUS "======================> Utilisation de l'API MachineTypes")
76+
set (MachineTypes_ENABLED ON)
77+
target_link_libraries (Lima PUBLIC MachineTypes::include)
78+
endif (${MachineTypes_FOUND})
7479

7580
set (LIMA_KERNEL_PUBLIC_FLAGS "${LIMA_CFLAGS}" LIMA_MT LIMA_USES_ATOMIC_API)
7681
#set (LIMA_KERNEL_PRIVATE_FLAGS "${CMAKE_CXX_FLAGS}")

src/Lima/cmake/LimaConfig.cmake.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ if (HDF5_REQUESTED)
99
endif (HDF5_REQUESTED)
1010
find_dependency (Threads)
1111

12-
# EXPURGE_BEGINNING_TAG LOCAL_DEPENDENCIES
13-
# EXPURGE_COMPLETION_TAG
12+
set (MachineTypes_FOUND @MachineTypes_ENABLED@)
13+
if (MachineTypes_FOUND)
14+
find_dependency (MachineTypes)
15+
endif (MachineTypes_FOUND)
1416

1517
@PACKAGE_INIT@
1618
# On force Lima_INCLUDE_DIR et Lima_LIB_DIR avant que des variables cmake ne soient modifiées par les macros cmake à suivre.

0 commit comments

Comments
 (0)