Sync1 (#1)

* Version 4.2.0 : sortie du projet GUIToolkits. * New CI workflows * Fix error in workflow --------- Co-authored-by: Charles PIGNEROL <>
LIHPC-Computational-Geometry · Jul 18, 2023 · ccf0602 · ccf0602
1 parent 7413140
commit ccf0602
Show file tree

Hide file tree

Showing 17 changed files with 96 additions and 204 deletions.
diff --git a/.github/workflows/cmake-ci.yml b/.github/workflows/cmake-ci.yml
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
@@ -0,0 +1,11 @@
+name: Make release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  call:
+    name: Call check version CI
+    uses: LIHPC-Computational-Geometry/lihpccg-ci/.github/workflows/make-release-reusable.yml@main
diff --git a/.github/workflows/spack-ci.yml b/.github/workflows/spack-ci.yml
@@ -1,15 +1,14 @@
 name: Spack CI
 
 on:
-  workflow_dispatch:
   push:
-    branches: [ main ]
+    branches:
+      - '**'
   pull_request:
-    branches: [ main ]
+  # Allows you to run this workflow manually
+  workflow_dispatch:
 
 jobs:
   call:
-    name: Call Spack reusable workflow
+    name: Call Spack CI
     uses: LIHPC-Computational-Geometry/lihpccg-ci/.github/workflows/spack-reusable.yml@main
-    with:
-      test-link-options: "-DBUILD_GQGMDS:BOOL=ON"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,12 +3,14 @@ cmake_minimum_required(VERSION 3.12)
 project (QQualif CXX C)
 
 include (GNUInstallDirs)
+
+find_package (GUIToolkitsVariables)
+
 include (cmake/version.cmake)
-include (cmake/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
 
 set (QQualif_VERSION ${QQUALIF_VERSION})
 
-# Ici et pas ailleurs : CMAKE_VERBOSE_MAKEFILE
 set (CMAKE_VERBOSE_MAKEFILE ON)
 option (BUILD_SHARED_LIBS "Creation de bibliotheques dynamiques (defaut : ON)" ON)
 

diff --git a/cmake/common.cmake b/cmake/common.cmake
diff --git a/cmake/organization.cmake b/cmake/organization.cmake
diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -2,9 +2,9 @@
 # version.cmake : version du projet
 #
 
-set (QQUALIF_MAJOR_VERSION "3")
-set (QQUALIF_MINOR_VERSION "9")
-set (QQUALIF_RELEASE_VERSION "1")
+set (QQUALIF_MAJOR_VERSION "4")
+set (QQUALIF_MINOR_VERSION "2")
+set (QQUALIF_RELEASE_VERSION "0")
 set (QQUALIF_VERSION ${QQUALIF_MAJOR_VERSION}.${QQUALIF_MINOR_VERSION}.${QQUALIF_RELEASE_VERSION})
 
 
diff --git a/cmake/workarounds.cmake b/cmake/workarounds.cmake
diff --git a/src/GQGMDS/CMakeLists.txt b/src/GQGMDS/CMakeLists.txt
@@ -1,9 +1,11 @@
 set (CURRENT_PACKAGE_NAME "GQGMDS")
 set (CURRENT_PACKAGE_MACRO_NAME "GQGMDS")
 
+find_package (GUIToolkitsVariables)
+
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
 
 find_package (gmds REQUIRED)
 

diff --git a/src/GQLima/CMakeLists.txt b/src/GQLima/CMakeLists.txt
@@ -1,13 +1,13 @@
 set (CURRENT_PACKAGE_NAME "GQLima")
 set (CURRENT_PACKAGE_MACRO_NAME "GQLIMA")
 
+find_package (GUIToolkitsVariables)
+
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
 
 find_package (Lima REQUIRED)
-# 02/23 - BL: lima is built without Hdf145
-# include (${Lima_LIB_DIR}/Lima/cmake/FindHdf145.cmake)
 
 file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h)
 file (GLOB CPP_SOURCES *.cpp)

diff --git a/src/GQVtk/CMakeLists.txt b/src/GQVtk/CMakeLists.txt
@@ -1,9 +1,12 @@
 set (CURRENT_PACKAGE_NAME "GQVtk")
 set (CURRENT_PACKAGE_MACRO_NAME "GQVTK")
 
+find_package (GUIToolkitsVariables)
+
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common_vtk.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
 
 #find_package (VtkContrib REQUIRED)	# Uniquement pour la dépendance à VTK, à remplacer par la suite
 if (VTK_7)
@@ -23,7 +26,9 @@ elseif (VTK_9)
 	find_package (VTK 9 REQUIRED COMPONENTS ${VTK_REQUIRED_PACKAGES})
 	set (VTK_LIB_DEPENDENCIES ${VTK_LIBRARIES})
 	set (VTK_INC_DEPENDENCIES )	# Empty, not usefull with VTK 8
-endif (VTK_8)
+else ( )
+	message (FATAL_ERROR "Version de VTK non supportée.")
+endif ( )
 
 file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h)
 file (GLOB CPP_SOURCES *.cpp)

diff --git a/src/GQVtk/VtkQualifSerie.cpp b/src/GQVtk/VtkQualifSerie.cpp
@@ -1,4 +1,5 @@
 #include <vtkConfigure.h>	// VTK_MAJOR_VERSION ...
+
 #include "GQVtk/VtkQualifSerie.h"
 #include "GQualif/QualifHelper.h"
 

diff --git a/src/GQualif/CMakeLists.txt b/src/GQualif/CMakeLists.txt
@@ -1,13 +1,16 @@
 set (CURRENT_PACKAGE_NAME "GQualif")
 set (CURRENT_PACKAGE_MACRO_NAME "GQUALIF")
 
+find_package (GUIToolkitsVariables)
+
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
 
-find_package (TkUtil 5 REQUIRED)
-find_package (Lima REQUIRED)
-#include (${Lima_LIB_DIR}/Lima/cmake/FindHdf145.cmake)
+find_package (TkUtil 6 REQUIRED)
+if (BUILD_GQLima)
+	find_package (Lima REQUIRED)
+endif (BUILD_GQLima)
 find_package (qualifinternal REQUIRED)
 
 file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h)
@@ -19,7 +22,7 @@ add_library (GQualif ${CPP_SOURCES} ${HEADERS})
 set (ALL_TARGETS GQualif)
 set_property (TARGET GQualif PROPERTY VERSION ${GQUALIF_VERSION})
 set_property (TARGET GQualif PROPERTY SOVERSION ${GQUALIF_MAJOR_VERSION})
-set (GQUALIF_PRIVATE_FLAGS -DGQUALIF_VERSION="${GQUALIF_VERSION}")
+set (GQUALIF_PRIVATE_FLAGS -DGQUALIF_VERSION="${GQUALIF_VERSION}" -DQQUALIF_VERSION="${QQUALIF_VERSION}")
 
 target_include_directories (GQualif PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/public>$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>)
 target_compile_definitions (GQualif PUBLIC ${GQUALIF_PUBLIC_FLAGS})

diff --git a/src/QCalQual/CMakeLists.txt b/src/QCalQual/CMakeLists.txt
@@ -1,8 +1,10 @@
 set (CURRENT_PACKAGE_NAME "QCalQual")
 
+find_package (GUIToolkitsVariables)
+
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
 
 find_package(Qt5Core NO_CMAKE_SYSTEM_PATH)	# In order to enable moc ...
 

diff --git a/src/QtQualif/CMakeLists.txt b/src/QtQualif/CMakeLists.txt
@@ -1,12 +1,14 @@
 set (CURRENT_PACKAGE_NAME "QtQualif")
 set (CURRENT_PACKAGE_MACRO_NAME "QT_QUALIF")
 
+find_package (GUIToolkitsVariables)
+
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
 
 find_package(Qt5Core NO_CMAKE_SYSTEM_PATH)	# In order to enable moc ...
-find_package (QwtCharts 4 REQUIRED)
+find_package (QwtCharts 5 REQUIRED)
 
 file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h)
 file (GLOB CPP_SOURCES *.cpp)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -1,8 +1,10 @@
 set (CURRENT_PACKAGE_NAME "tests")
 
+find_package (GUIToolkitsVariables)
+
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
-include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
 
 
 add_executable (hexagen hexagen.cpp)