Sync1

.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

.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

CMakeLists.txt

@@ -3,12 +3,14 @@ cmake_minimum_required(VERSION 3.12)
 project (QtUtil CXX)
 
 include (GNUInstallDirs)
+
+find_package (GUIToolkitsVariables)
+
 include (cmake/version.cmake)
-include (cmake/common.cmake)
+include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
 
 set (QtUtil_VERSION ${QT_UTIL_VERSION})
 
-# Ici et pas ailleurs : CMAKE_VERBOSE_MAKEFILE
 set (CMAKE_VERBOSE_MAKEFILE ON)
 option (BUILD_SHARED_LIBS "Creation de bibliotheques dynamiques (defaut : ON)" ON)
 

cmake/version.cmake

@@ -2,9 +2,9 @@
 # version.cmake : version du projet
 #
 
-set (QT_UTIL_MAJOR_VERSION "5")
-set (QT_UTIL_MINOR_VERSION "7")
-set (QT_UTIL_RELEASE_VERSION "8")
+set (QT_UTIL_MAJOR_VERSION "6")
+set (QT_UTIL_MINOR_VERSION "2")
+set (QT_UTIL_RELEASE_VERSION "0")
 set (QT_UTIL_VERSION ${QT_UTIL_MAJOR_VERSION}.${QT_UTIL_MINOR_VERSION}.${QT_UTIL_RELEASE_VERSION})
 
 

src/QtUtil/CMakeLists.txt

@@ -1,11 +1,13 @@
 set (CURRENT_PACKAGE_NAME "QtUtil")
 set (CURRENT_PACKAGE_MACRO_NAME "QT_UTIL")
 
+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 (TkUtil 6 REQUIRED)
 find_package (Qt5Widgets 5 REQUIRED NO_CMAKE_SYSTEM_PATH)
 find_package (Qt5PrintSupport 5 REQUIRED NO_CMAKE_SYSTEM_PATH)
 #

src/encoding/CMakeLists.txt

@@ -1,6 +1,8 @@
+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 (Qt5Widgets 5 REQUIRED NO_CMAKE_SYSTEM_PATH)
 

src/flow/CMakeLists.txt

@@ -1,6 +1,8 @@
+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 (Qt5Widgets 5 REQUIRED NO_CMAKE_SYSTEM_PATH)
 

src/tests/CMakeLists.txt

@@ -1,6 +1,8 @@
+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 (Qt5Widgets 5 REQUIRED NO_CMAKE_SYSTEM_PATH)
 

src/tests/QtAboutMainWindow.cpp

@@ -84,8 +84,6 @@ string	QtAboutMainWindow::webTag ("");
 QtAboutMainWindow::QtAboutMainWindow (QWidget* parent)
 	: QMainWindow (parent), _webBrowser (0), _logView (0), _statusLogOutputStream (0), _logDispatcher ( )
 {
-// EXPURGE_BEGINNING_TAG WEB_PAGES_TAG
-// EXPURGE_COMPLETION_TAG	
 	QMenu*	menu	= new QMenu ("Application", this);
 	menuBar ( )->addMenu (menu);
 	menu->setToolTipsVisible (true);