From afdc4e8384f869ad3f7c1ff47d4d596f4e08ac61 Mon Sep 17 00:00:00 2001
From: Charles PIGNEROL <>
Date: Mon, 11 Sep 2023 16:25:05 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Version=207.8.1=20du=2008/09/23.=20Correcti?=
 =?UTF-8?q?f=20d=C3=A9pendance=20cmake=20=C3=A0=20MachineTypes=20:=20propa?=
 =?UTF-8?q?gation=20de=20la=20d=C3=A9pendance=20aux=20en-t=C3=AAtes.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmake/version.cmake     | 2 +-
 src/Lima/CMakeLists.txt | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cmake/version.cmake b/cmake/version.cmake
index f319b5f..7ad8ccf 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -4,7 +4,7 @@
 
 set (LIMA_MAJOR_VERSION "7")
 set (LIMA_MINOR_VERSION "8")
-set (LIMA_RELEASE_VERSION "0")
+set (LIMA_RELEASE_VERSION "1")
 set (LIMA_VERSION ${LIMA_MAJOR_VERSION}.${LIMA_MINOR_VERSION}.${LIMA_RELEASE_VERSION})
 
 
diff --git a/src/Lima/CMakeLists.txt b/src/Lima/CMakeLists.txt
index 3c21ef2..b4ae153 100644
--- a/src/Lima/CMakeLists.txt
+++ b/src/Lima/CMakeLists.txt
@@ -75,6 +75,15 @@ if (${MachineTypes_FOUND})
 	message (STATUS "======================> Utilisation de l'API MachineTypes")
 	set (MachineTypes_ENABLED ON)
 	target_link_libraries (Lima PUBLIC MachineTypes::include)
+	if (MachineTypes_INCLUDE_DIR)
+		target_include_directories (Lima PUBLIC ${MachineTypes_INCLUDE_DIR})
+	elseif (MachineTypes_INCLUDE_DIRS)
+		target_include_directories (Lima PUBLIC ${MachineTypes_INCLUDE_DIRS})
+	else ( )
+		# Si il y a une demande d'utilisation de MachineTypes ce peut être très important, ça défini entre autres les types des variables transmis en arguments des fonctions
+		# => Pas le droit à l'erreur, on bloque donc en cas de doute.
+		message (FATAL_ERROR "Variables MachineTypes_INCLUDE_DIRS et MachineTypes_INCLUDE_DIRS nulles.")
+	endif ( )
 endif (${MachineTypes_FOUND})
 
 set (LIMA_KERNEL_PUBLIC_FLAGS "${LIMA_CFLAGS}" LIMA_MT LIMA_USES_ATOMIC_API)

From cad82ba2633bdb1a7b20fcc5db321c93fba36fa0 Mon Sep 17 00:00:00 2001
From: Benoit LELANDAIS <benoit.lelandais@cea.fr>
Date: Thu, 14 Sep 2023 10:31:56 +0200
Subject: [PATCH 2/2] CMake presets updated

---
 CMakePresets.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakePresets.json b/CMakePresets.json
index a711d27..5095ab5 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -2,7 +2,12 @@
     "version": 3,
     "configurePresets": [
       {
-        "name": "ci"
+        "name": "ci",
+        "cacheVariables":
+        {
+          "MACHINE_TYPES": "OFF",
+          "FORMAT_MLI2": "OFF"
+        }
       }
     ]
 }