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" + } } ] } 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)