Skip to content

Version 7.8.1 du 08/09/23. Correctif dépendance cmake à MachineTypes … #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 14, 2023
Merged

Version 7.8.1 du 08/09/23. Correctif dépendance cmake à MachineTypes … #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afdc4e8
Version 7.8.1 du 08/09/23. Correctif dépendance cmake à MachineTypes …
Sep 11, 2023
cad82ba
CMake presets updated
lelandaisb Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
"version": 3,
"configurePresets": [
{
"name": "ci"
"name": "ci",
"cacheVariables":
{
"MACHINE_TYPES": "OFF",
"FORMAT_MLI2": "OFF"
}
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion cmake/version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})


Expand Down
9 changes: 9 additions & 0 deletions src/Lima/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down