Merge pull request #19 from LIHPC-Computational-Geometry/binding-access-7.12.1

Version 7.12.1. CMake tweaks to access the location of the Lima binding.

Author: CharlesPignerol

cmake/version.cmake

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

installation.txt

@@ -22,7 +22,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 -DPython3_ROOT_DIR=/usr/lib/python3 -DHDF5_ROOT=/opt/HDF5/1.12.0  \
-      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.12.0
+      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.12.1
 cmake --build /tmp/lima_build_dir
 cmake --install /tmp/lima_build_dir
 
@@ -32,7 +32,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 -DPython3_ROOT_DIR=/usr/lib/python3 -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.12.0
+      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.12.1
 cmake --build /tmp/lima_build_dir
 cmake --install /tmp/lima_build_dir
 

src/Lima/CMakeLists.txt

@@ -157,10 +157,18 @@ 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 (SCRIPTING_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
+if (BUILD_SCRIPTING)
+	include (${CMAKE_SOURCE_DIR}/cmake/python_binding.cmake)
+	set (SCRIPTING_INSTALL_DIR ${CMAKE_PYTHON_RPATH_DIR})	# LimaScripting_RUNTIME_DIR avec LimaConfig.cmake.in
+endif (BUILD_SCRIPTING)
+
+set (BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR})	# xlmlima_RUNTIME_DIR avec LimaConfig.cmake.in
+
 #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 BIN_INSTALL_DIR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR SCRIPTING_INSTALL_DIR ICEM_SUPPORTED MLI_SUPPORTED MLI2_SUPPORTED MachineTypes_ENABLED Sumesh_ENABLED 
 	HAS_LIMA_SCRIPTING HAS_LIMA_TOOLS HAS_LIMA_TESTS
 	)
 

src/Lima/cmake/LimaConfig.cmake.in

@@ -22,24 +22,12 @@ set_and_check (Lima_LIB_DIR   "@PACKAGE_LIB_INSTALL_DIR@")
 
 # Ugly code :
 set (Lima_VERSION @LIMA_VERSION@)
-check_required_components (Lima)
+set (Lima_Lima_FOUND TRUE)
 
 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@)
@@ -50,14 +38,33 @@ set (ICEM_SUPPORT @ICEM_SUPPORTED@)
 include(${CMAKE_CURRENT_LIST_DIR}/LimaTargets.cmake)
 
 if (HAS_LIMA_SCRIPTING)
+	set (Lima_LimaScripting_FOUND TRUE)
+	set_and_check (LimaScripting_RUNTIME_DIR   "@PACKAGE_SCRIPTING_INSTALL_DIR@")
 	include(${CMAKE_CURRENT_LIST_DIR}/LimaScriptingTargets.cmake)
 endif (HAS_LIMA_SCRIPTING)
 
 if (HAS_LIMA_TOOLS)
+	set (Lima_Xlmlima_FOUND TRUE)
+	set (Lima_Symetrise_FOUND TRUE)
 	include(${CMAKE_CURRENT_LIST_DIR}/XlmlimaTargets.cmake)
 	include(${CMAKE_CURRENT_LIST_DIR}/SymetriseTargets.cmake)
 endif (HAS_LIMA_TOOLS)
 
 if (HAS_LIMA_TESTS)
+	set (Lima_Comparaison_FOUND TRUE)
 	include(${CMAKE_CURRENT_LIST_DIR}/ComparaisonTargets.cmake)
 endif (HAS_LIMA_TESTS)
+
+check_required_components (Lima)
+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)

src/LimaScripting/cmake/LimaScriptingConfig.cmake.in

@@ -6,7 +6,7 @@ find_dependency (Python@PYTHON_MAJOR_VERSION@ REQUIRED COMPONENTS Interpreter De
 # On force LimaScripting_INCLUDE_DIR, LimaScripting_LIB_DIR et LimaScripting_RUNTIME_DIR avant que des variables cmake ne soient modifiées par les macros cmake à suivre.
 set_and_check (LimaScripting_INCLUDE_DIR   "@PACKAGE_INCLUDE_INSTALL_DIR@")
 set_and_check (LimaScripting_LIB_DIR   "@PACKAGE_LIB_INSTALL_DIR@")
-set_and_check (LimaScripting_RUNTIME_DIR   "@PACKAGE_RUNTIME_INSTALL_DIR@")
+set_and_check (LimaScripting_RUNTIME_DIR   "@PACKAGE_SCRIPTING_INSTALL_DIR@")
 
 # Ugly code :
 include("${CMAKE_CURRENT_LIST_DIR}/../../Lima/cmake/LimaTargets.cmake")

src/Xlmlima_exe/cmake/Xlmlima_exeConfig.cmake.in

@@ -1,5 +1,5 @@
 @PACKAGE_INIT@
 set (XLMLIMA_VERSION @LIMA_VERSION@)
-set_and_check (xlmlima_RUNTIME_DIR   "@PACKAGE_RUNTIME_INSTALL_DIR@")
+set_and_check (xlmlima_RUNTIME_DIR   "@PACKAGE_BIN_INSTALL_DIR@")