Merge pull request #6 from LIHPC-Computational-Geometry/vtklibpath_fix

Version dated 06/18/24. Fix determination of VTK_LIBRARY_PATH.

Author: CharlesPignerol

cmake/common_vtk.cmake

@@ -4,22 +4,32 @@ set (VTK_9 OFF)
 set (USE_OPENGL_BACKEND OFF)
 set (QVTK_WIDGET OFF)
 unset (VTK_LIBRARY_PATH)
+unset (COMMON_CORE_COMPONENT)
+unset (COMMON_CORE_TARGET)
 find_package (VTK REQUIRED)
 message (STATUS "VTK DETECTE : ${VTK_VERSION}")
 if (VTK_VERSION_MAJOR STREQUAL "7")
 	set (VTK_7 ON)
 	set (USE_OPENGL_BACKEND ON)
 	set (QVTK_WIDGET ON)
+	set (COMMON_CORE_COMPONENT vtkCommonCore)
+	set (COMMON_CORE_TARGET vtkCommonCore)
 elseif (VTK_VERSION_MAJOR STREQUAL "8")
 	set (VTK_8 ON)
+	set (COMMON_CORE_TARGET vtkCommonCore)
 elseif (VTK_VERSION_MAJOR STREQUAL "9")
 	set (VTK_9 ON)
+	set (COMMON_CORE_COMPONENT CommonCore)
+	set (COMMON_CORE_TARGET VTK::CommonCore)
 else ( )
 	message (FATAL_ERROR "Version majeure de VTK non gérée : ${VTK_VERSION}")
 endif ( )
 
-if (VTK_9)
-	set (VTK_LIBRARY_PATH "${VTK_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}")
+find_package (VTK ${VTK_VERSION_MAJOR} REQUIRED COMPONENTS ${COMMON_CORE_COMPONENT})
+if (NOT TARGET ${COMMON_CORE_TARGET})
+	message (FATAL_ERROR "${COMMON_CORE_TARGET} non chargée.")
 else ( )
-	set (VTK_LIBRARY_PATH "${VTK_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-endif (VTK_9)
+	get_target_property (VTK_CORE_LOCATION ${COMMON_CORE_TARGET} LOCATION)
+	get_filename_component (VTK_LIBRARY_PATH ${VTK_CORE_LOCATION} DIRECTORY)
+endif (NOT TARGET ${COMMON_CORE_TARGET})
+

cmake/version.cmake

@@ -4,5 +4,5 @@
 
 set (GUI_TOOLKITS_VARIABLES_MAJOR_VERSION "1")
 set (GUI_TOOLKITS_VARIABLES_MINOR_VERSION "5")
-set (GUI_TOOLKITS_VARIABLES_RELEASE_VERSION "0")
+set (GUI_TOOLKITS_VARIABLES_RELEASE_VERSION "1")
 set (GUI_TOOLKITS_VARIABLES_VERSION ${GUI_TOOLKITS_VARIABLES_MAJOR_VERSION}.${GUI_TOOLKITS_VARIABLES_MINOR_VERSION}.${GUI_TOOLKITS_VARIABLES_RELEASE_VERSION})

versions.txt

@@ -1,3 +1,9 @@
+Version 1.5.1 : 18/06/24
+===============
+
+cmake/common_vtk.cmake : meilleure formulation par détection de VTK_LIBRARY_PATH.
+
+
 Version 1.5.0 : 07/06/24
 ===============