Merge pull request #5 from LIHPC-Computational-Geometry/dev-7.9.1

Dev 7.9.1

Author: CharlesPignerol

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)
@@ -19,5 +20,10 @@ option (SUMESH "Utilisation de la bibliothèque de sumesh." ON)
 option (FORMAT_MLI "Format obsolète déconseillé en externe. Requiert HDF145." ON)
 option (FORMAT_MLI2 "Format remplaçant le format MLI recommandé partout. Requiert HDF 5 v >= 1.10.0." ON)
 
+# Binaires optionnels :
+option (BUILD_SCRIPTING "Génération du wrapper swig/python pour utilisation scriptée de Lima." ON)
+option (BUILD_XLMLIMA "Utilitaire xlmlima (conversions, préparations de maillages), symetrise (symétrisation / x, y ou z)." ON)
+option (BUILD_TESTS "Création de l'utilitaire comparaison." OFF)
+
 add_subdirectory (src)
 enable_testing ( )

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})
 
 

installation.txt

@@ -20,7 +20,7 @@ cmake -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_
       -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_XLMLIMA=ON -DBUILD_TESTS:BOOL=ON -DBUILD_SCRIPTING:BOOL=ON -DMACHINE_TYPES:BOOL=OFF -DSUMESH:BOOL=OFF -DFORMAT_MLI:BOOL=OFF -DFORMAT_MLI2:BOOL=ON -DFORMAT_MLI2:BOOL=ON \
       -DBUILD_SHARED_LIBS:BOOL=ON -DINT_8:BOOL=ON -DREAL_8:BOOL=ON \
       -DSWIG_EXECUTABLE=/opt/swig/4.1.1/bin/swig -DPython2_ROOT_DIR=/usr/lib/python2.7 -DHDF5_ROOT=/opt/HDF5/1.12.0  \
-      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.9.0
+      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.9.1
 cmake --build /tmp/lima_build_dir
 cmake --install /tmp/lima_build_dir
 
@@ -30,7 +30,7 @@ cmake -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_
       -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_XLMLIMA=ON -DBUILD_TESTS:BOOL=ON -DBUILD_SCRIPTING:BOOL=ON -DMACHINE_TYPES:BOOL=ON -DSUMESH:BOOL=ON -DFORMAT_MLI:BOOL=ON -DFORMAT_MLI2:BOOL=ON \
       -DBUILD_SHARED_LIBS:BOOL=ON -DINT_8:BOOL=ON -DREAL_8:BOOL=ON \
       -DSWIG_EXECUTABLE=/opt/swig/4.1.1/bin/swig -DPython2_ROOT_DIR=/usr/lib/python2.7 -DHDF5_ROOT=/opt/HDF5/1.12.0 -DHDF145_INCLUDE_DIR=/opt/hdf145/1.3.0/include -DHDF145CPP_LIBRARY=/opt/hdf145/1.3.0/lib/libhdf145_cpp.so -DHDF145_LIBRARY=/opt/hdf145/1.3.0/lib/libhdf145.so \
-      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.9.0
+      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.9.1
 cmake --build /tmp/lima_build_dir
 cmake --install /tmp/lima_build_dir
 

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/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)
@@ -144,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

@@ -24,6 +24,23 @@ set_and_check (Lima_LIB_DIR   "@PACKAGE_LIB_INSTALL_DIR@")
 set (Lima_VERSION @LIMA_VERSION@)
 check_required_components (Lima)
 
+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@)
 set (MLI2_SUPPORT @MLI2_SUPPORTED@)
@@ -32,3 +49,15 @@ set (ICEM_SUPPORT @ICEM_SUPPORTED@)
 # Fournir l'accès aux services des cibles (fichier non inclus automatiquement) :
 include(${CMAKE_CURRENT_LIST_DIR}/LimaTargets.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)

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})