Version 7.9.1. Cmake fix when mli format support is requested but HDF145 is not available. Exported cmake target adjustments for non-regression testing.

Author: Charles PIGNEROL

CMakeLists.txt

@@ -7,6 +7,7 @@ include (cmake/version.cmake)
 include (cmake/common.cmake)
 
 set (Lima_VERSION ${LIMA_VERSION})
+set (PROJECT_NAMESPACE "${PROJECT_NAME}::")
 
 option (VERBOSE_MAKEFILE ON)
 option (BUILD_SHARED_LIBS "Creation de bibliotheques dynamiques (defaut : ON)" ON)

cmake/organization.cmake

@@ -7,13 +7,15 @@
 # ================
 
 # Le répertoire d'installation où sont mis les fichiers cmake à destination des utilisateurs (Module/cmake) :
-set (CMAKE_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/${CURRENT_PACKAGE_NAME}/cmake)
+#set (CMAKE_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/${CURRENT_PACKAGE_NAME}/cmake)
+set (CMAKE_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake)
 
 # Répertoire d'installation des bibliothèques (pour le RPATH) :
 set (CMAKE_PACKAGE_RPATH_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
 
 # Module::
-set (CMAKE_MODULE_NAMESPACE ${CURRENT_PACKAGE_NAME}::)
+#set (CMAKE_MODULE_NAMESPACE ${CURRENT_PACKAGE_NAME}::)
+set (CMAKE_MODULE_NAMESPACE ${PROJECT_NAME}::)
 
 # ModuleConfig
 set (CMAKE_PACKAGE_CONFIG_NAME ${CURRENT_PACKAGE_NAME}Config)
@@ -22,7 +24,8 @@ set (CMAKE_PACKAGE_CONFIG_NAME ${CURRENT_PACKAGE_NAME}Config)
 set (CMAKE_PACKAGE_TARGETS_NAME ${CURRENT_PACKAGE_NAME}Targets)
 
 # Le répertoire des fichiers de configuration (lib/Module/cmake) :
-set (CMAKE_PACKAGE_CONFIG_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CURRENT_PACKAGE_NAME})
+#set (CMAKE_PACKAGE_CONFIG_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CURRENT_PACKAGE_NAME})
+set (CMAKE_PACKAGE_CONFIG_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME})
 
 # Le Fichier lib/Module/cmake/ModuleConfigVersion.cmake :
 set (CMAKE_PACKAGE_CONFIG_FILE ${CMAKE_PACKAGE_CONFIG_DIR}/${CMAKE_PACKAGE_CONFIG_NAME}.cmake)

cmake/version.cmake

@@ -4,7 +4,7 @@
 
 set (LIMA_MAJOR_VERSION "7")
 set (LIMA_MINOR_VERSION "9")
-set (LIMA_RELEASE_VERSION "0")
+set (LIMA_RELEASE_VERSION "1")
 set (LIMA_VERSION ${LIMA_MAJOR_VERSION}.${LIMA_MINOR_VERSION}.${LIMA_RELEASE_VERSION})
 
 

src/Comparaison_exe/CMakeLists.txt

@@ -1,4 +1,4 @@
-set (CURRENT_PACKAGE_NAME "Comparaison_exe")
+set (CURRENT_PACKAGE_NAME "Comparaison")
 
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
 include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
@@ -14,5 +14,9 @@ target_link_libraries (comparaison PUBLIC Lima)
 # INSTALL_RPATH modifie le rpath pour les libs internes au projet :
 set_target_properties (comparaison PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1 INSTALL_RPATH ${CMAKE_PACKAGE_RPATH_DIR})
 
+install(TARGETS comparaison EXPORT Comparaison DESTINATION ${CMAKE_INSTALL_BINDIR}
+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
+set (ConfigPackageLocation ${CMAKE_CMAKE_DIR})
+install (EXPORT Comparaison FILE ComparaisonTargets.cmake NAMESPACE ${PROJECT_NAMESPACE} DESTINATION ${ConfigPackageLocation})
 

src/Lima/CMakeLists.txt

@@ -8,6 +8,9 @@ if (MACHINE_TYPES)
 endif (MACHINE_TYPES)
 if (FORMAT_MLI)
 	include (${CMAKE_SOURCE_DIR}/cmake/FindHdf145.cmake)
+	if (NOT HDF145_FOUND)
+		message (FATAL_ERROR "Support du format mli demandé mais bibliothèque HDF145 non trouvée.")
+	endif (NOT HDF145_FOUND)
 endif (FORMAT_MLI)
 unset (HDF5_USE_STATIC_LIBRARIES)
 if (FORMAT_MLI2)

src/Lima/cmake/LimaConfig.cmake.in

@@ -23,6 +23,10 @@ set_and_check (Lima_LIB_DIR   "@PACKAGE_LIB_INSTALL_DIR@")
 # Ugly code :
 set (Lima_VERSION @LIMA_VERSION@)
 check_required_components (Lima)
+check_required_components (LimaScripting)
+check_required_components (Xlmlima)
+check_required_components (Comparaison)
+check_required_components (Symetrize)
 
 # Les formats optionnels supportés (ON) ou non (OFF) :
 set (MLI_SUPPORT @MLI_SUPPORTED@)
@@ -31,4 +35,7 @@ set (ICEM_SUPPORT @ICEM_SUPPORTED@)
 
 # Fournir l'accès aux services des cibles (fichier non inclus automatiquement) :
 include(${CMAKE_CURRENT_LIST_DIR}/LimaTargets.cmake)
-
+include(${CMAKE_CURRENT_LIST_DIR}/LimaScriptingTargets.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/XlmlimaTargets.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/ComparaisonTargets.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/SymetriseTargets.cmake)

src/Symetrise/CMakeLists.txt

@@ -1,4 +1,4 @@
-set (CURRENT_PACKAGE_NAME "Symetrise_exe")
+set (CURRENT_PACKAGE_NAME "Symetrise")
 
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
 include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
@@ -14,5 +14,8 @@ target_link_libraries (symetrise PUBLIC Lima)
 # INSTALL_RPATH modifie le rpath pour les libs internes au projet :
 set_target_properties (symetrise PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1 INSTALL_RPATH ${CMAKE_PACKAGE_RPATH_DIR})
 
-install(TARGETS symetrise EXPORT Symetrise_exe DESTINATION ${CMAKE_INSTALL_BINDIR}
+install(TARGETS symetrise EXPORT Symetrise DESTINATION ${CMAKE_INSTALL_BINDIR}
         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+set (ConfigPackageLocation ${CMAKE_CMAKE_DIR})
+install (EXPORT Symetrise FILE SymetriseTargets.cmake NAMESPACE ${PROJECT_NAMESPACE} DESTINATION ${ConfigPackageLocation})

src/Xlmlima_exe/CMakeLists.txt

@@ -1,4 +1,4 @@
-set (CURRENT_PACKAGE_NAME "Xlmlima_exe")
+set (CURRENT_PACKAGE_NAME "Xlmlima")
 
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
 include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
@@ -15,33 +15,10 @@ target_link_libraries (xlmlima PRIVATE Lima)
 # INSTALL_RPATH modifie le rpath pour les libs internes au projet :
 set_target_properties (xlmlima PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1 INSTALL_RPATH ${CMAKE_PACKAGE_RPATH_DIR})
 
-# INSTALLATION :
-include(CMakePackageConfigHelpers)
-# ConfigPackageLocation : c'est plus ou moins standardisé, le défaut étant lib/cmake.
-# On nos recommande très vivement d'utiliser ce répertoire afin de limiter les soucis par la suite,
-# notamment au niveau des vues.
-set (ConfigPackageLocation ${CMAKE_CMAKE_DIR})
-
-install(TARGETS xlmlima EXPORT Xlmlima_exe DESTINATION ${CMAKE_INSTALL_BINDIR}
+install(TARGETS xlmlima EXPORT Xlmlima DESTINATION ${CMAKE_INSTALL_BINDIR}
         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
-set (RUNTIME_INSTALL_DIR bin/)
-configure_package_config_file(cmake/${CURRENT_PACKAGE_NAME}Config.cmake.in
-        ${CMAKE_CURRENT_BINARY_DIR}/${CURRENT_PACKAGE_NAME}/${CURRENT_PACKAGE_NAME}Config.cmake
-        INSTALL_DESTINATION ${CMAKE_CMAKE_DIR}
-        PATH_VARS RUNTIME_INSTALL_DIR
-    )
-write_basic_package_version_file(
-        ${CMAKE_CURRENT_BINARY_DIR}/${CURRENT_PACKAGE_NAME}/${CURRENT_PACKAGE_NAME}ConfigVersion.cmake
-        VERSION ${LIMA_VERSION}
-        COMPATIBILITY SameMajorVersion
-    )
-install (
-   FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/${CURRENT_PACKAGE_NAME}/${CURRENT_PACKAGE_NAME}Config.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/${CURRENT_PACKAGE_NAME}/${CURRENT_PACKAGE_NAME}ConfigVersion.cmake
-   DESTINATION ${ConfigPackageLocation}
-   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ
-   )
+set (ConfigPackageLocation ${CMAKE_CMAKE_DIR})
+install (EXPORT Xlmlima FILE XlmlimaTargets.cmake NAMESPACE ${PROJECT_NAMESPACE} DESTINATION ${ConfigPackageLocation})