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

Author: Charles PIGNEROL

src/CMakeLists.txt

@@ -1,5 +1,6 @@
 message (STATUS "===============> Compilation du noyau Lima")
 add_subdirectory (Lima)
+
 if (BUILD_SCRIPTING)
 	message (STATUS "===============> Compilation de l'API scripting de Lima")
 	add_subdirectory (LimaScripting)
@@ -9,7 +10,8 @@ if (BUILD_TESTS)
 	message (STATUS "===============> Compilation des executables tests de Lima")
 	add_subdirectory (Comparaison_exe)
 endif ( )
-if (BUILD_XLMLIMA)
+
+if (BUILD_XLMLIMA)	# and other tools
 	message (STATUS "===============> Compilation de l'utilitaire xlmlima")
 	add_subdirectory (Xlmlima_exe)
 	add_subdirectory (Symetrise)

src/Lima/CMakeLists.txt

@@ -147,11 +147,16 @@ export (EXPORT ${CMAKE_PACKAGE_TARGETS_NAME} FILE ${CMAKE_PACKAGE_TARGETS_FILE}
 
 # Utilisation par d'autres modules de Lima :
 set (INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})	# Lima_INCLUDE_DIR avec LimaConfig.cmake.in
-set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})		# Lima_LIB_DIR avec LimaConfig.cmake.in
-#set (RUNTIME_INSTALL_DIR ${CMAKE_INSTALL_BINDIR})	# Lima_RUNTIME_DIR avec LimaConfig.cmake.in
+set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})			# Lima_LIB_DIR avec LimaConfig.cmake.in
+set (HAS_LIMA_SCRIPTING ${BUILD_SCRIPTING})				# Python/Swig wrapper
+set (HAS_LIMA_TOOLS ${BUILD_XLMLIMA})					# XlmLima, Symetrise
+set (HAS_LIMA_TESTS ${BUILD_TESTS})						# Comparaison
+
+#set (RUNTIME_INSTALL_DIR ${CMAKE_INSTALL_BINDIR})		# Lima_RUNTIME_DIR avec LimaConfig.cmake.in
 # Création du fichier LimaConfig.cmake qui définira Lima_INCLUDE_DIR, Lima_LIB_DIR et Lima_BIN_DIR :
 configure_package_config_file (cmake/${CMAKE_PACKAGE_CONFIG_NAME}.cmake.in ${CMAKE_PACKAGE_CONFIG_FILE}
-	INSTALL_DESTINATION ${CMAKE_CMAKE_DIR} PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR ICEM_SUPPORTED MLI_SUPPORTED MLI2_SUPPORTED MachineTypes_ENABLED Sumesh_ENABLED
+	INSTALL_DESTINATION ${CMAKE_CMAKE_DIR} PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR ICEM_SUPPORTED MLI_SUPPORTED MLI2_SUPPORTED MachineTypes_ENABLED Sumesh_ENABLED 
+	HAS_LIMA_SCRIPTING HAS_LIMA_TOOLS HAS_LIMA_TESTS
 	)
 
 # Copie du fichier LimaTargets.cmake dans prefix/lib/Lima/cmake :

src/Lima/cmake/LimaConfig.cmake.in

@@ -23,10 +23,23 @@ 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 (Symetrise)
+
+set (HAS_LIMA_SCRIPTING @HAS_LIMA_SCRIPTING@)
+set (HAS_LIMA_TOOLS @HAS_LIMA_TOOLS@)
+set (HAS_LIMA_TESTS @HAS_LIMA_TESTS@)
+
+if (HAS_LIMA_SCRIPTING)
+	check_required_components (LimaScripting)
+endif (HAS_LIMA_SCRIPTING)
+
+if (HAS_LIMA_TOOLS)
+	check_required_components (Xlmlima)
+	check_required_components (Symetrise)
+endif (HAS_LIMA_TOOLS)
+
+if (HAS_LIMA_TESTS)
+	check_required_components (Comparaison)
+endif (HAS_LIMA_TESTS)
 
 # Les formats optionnels supportés (ON) ou non (OFF) :
 set (MLI_SUPPORT @MLI_SUPPORTED@)
@@ -35,7 +48,16 @@ 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)
+
+if (HAS_LIMA_SCRIPTING)
+	include(${CMAKE_CURRENT_LIST_DIR}/LimaScriptingTargets.cmake)
+endif (HAS_LIMA_SCRIPTING)
+
+if (HAS_LIMA_TOOLS)
+	include(${CMAKE_CURRENT_LIST_DIR}/XlmlimaTargets.cmake)
+	include(${CMAKE_CURRENT_LIST_DIR}/SymetriseTargets.cmake)
+endif (HAS_LIMA_TOOLS)
+
+if (HAS_LIMA_TESTS)
+	include(${CMAKE_CURRENT_LIST_DIR}/ComparaisonTargets.cmake)
+endif (HAS_LIMA_TESTS)