Sync1 (#1)

* Version 5.2.0 : sortie du projet GUIToolkits. * Version 5.2.0 du 23/06/23. Sortie de GUIToolkits. Les includes (FindQwt.cmake) sont remplacés par des find_package/dependency (Qwt). * New CI workflows * Set path to FindQwt.cmake file * Path to FindQwt.cmake added to config during install --------- Co-authored-by: Charles PIGNEROL <>
LIHPC-Computational-Geometry · Jul 17, 2023 · 9064fb7 · 9064fb7
1 parent 5251405
commit 9064fb7
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 347 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,13 +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
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,8 +3,11 @@ cmake_minimum_required(VERSION 3.12)
 project (QwtCharts CXX)
 
 include (GNUInstallDirs)
+
+find_package (GUIToolkitsVariables)
+
 include (cmake/version.cmake)
-include (cmake/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
 
 
 set (QwtCharts_VERSION ${QWT_CHARTS_VERSION})

diff --git a/cmake/FindQwt.cmake b/cmake/FindQwt.cmake
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 (QWT_CHARTS_MAJOR_VERSION "4")
-set (QWT_CHARTS_MINOR_VERSION "4")
-set (QWT_CHARTS_RELEASE_VERSION "13")
+set (QWT_CHARTS_MAJOR_VERSION "5")
+set (QWT_CHARTS_MINOR_VERSION "2")
+set (QWT_CHARTS_RELEASE_VERSION "0")
 set (QWT_CHARTS_VERSION ${QWT_CHARTS_MAJOR_VERSION}.${QWT_CHARTS_MINOR_VERSION}.${QWT_CHARTS_RELEASE_VERSION})
 
 
diff --git a/cmake/workarounds.cmake b/cmake/workarounds.cmake