diff --git a/.github/workflows/cmake-ci.yml b/.github/workflows/cmake-ci.yml deleted file mode 100644 index 657f563..0000000 --- a/.github/workflows/cmake-ci.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Cmake CI - -on: - workflow_dispatch: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - call: - name: Call Cmake reusable workflow - uses: LIHPC-Computational-Geometry/lihpccg-ci/.github/workflows/cmake-reusable.yml@main - with: - run-tests: false diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml new file mode 100644 index 0000000..dae16eb --- /dev/null +++ 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 index 9b60d48..0299c3b 100644 --- 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 index 5d339f6..a9ab5f7 100644 --- 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 deleted file mode 100644 index e29d211..0000000 --- a/cmake/FindQwt.cmake +++ /dev/null @@ -1,156 +0,0 @@ -# -# Surcouche CEA/DAM : ajout des targets (en fin de fichier) -# - -# -# (C) 2005-2017 Centre National d'Etudes Spatiales (CNES) -# -# This file is part of Orfeo Toolbox -# -# https://www.orfeo-toolbox.org/ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Qt Widgets for Technical Applications -# available at http://www.http://qwt.sourceforge.net/ -# -# The module defines the following variables: -# QWT_FOUND - the system has Qwt -# QWT_INCLUDE_DIR - where to find qwt_plot.h -# QWT_INCLUDE_DIRS - qwt includes -# QWT_LIBRARY - where to find the Qwt library -# QWT_LIBRARIES - additional libraries -# QWT_MAJOR_VERSION - major version -# QWT_MINOR_VERSION - minor version -# QWT_PATCH_VERSION - patch version -# QWT_VERSION_STRING - version (ex. 5.2.1) -# QWT_ROOT_DIR - root dir - -#============================================================================= -# Copyright 2010-2013, Julien Schueller -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# The views and conclusions contained in the software and documentation are those -# of the authors and should not be interpreted as representing official policies, -# either expressed or implied, of the FreeBSD Project. -#============================================================================= - -# message( "QWT_INCLUDE_DIR: '${QWT_INCLUDE_DIR}'" ) -# message( "QWT_INCLUDE_DIR: '${QT_INCLUDE_DIR}'" ) - -find_path( QWT_INCLUDE_DIR - NAMES qwt_plot.h - PATH_SUFFIXES qwt -) - -# message( "QWT_INCLUDE_DIR: '${QWT_INCLUDE_DIR}'" ) -# message( "QWT_INCLUDE_DIR: '${QT_INCLUDE_DIR}'" ) - -set ( QWT_INCLUDE_DIRS ${QWT_INCLUDE_DIR} ) - -# version -set ( _VERSION_FILE ${QWT_INCLUDE_DIR}/qwt_global.h ) -if ( EXISTS ${_VERSION_FILE} ) - file ( STRINGS ${_VERSION_FILE} _VERSION_LINE REGEX "define[ ]+QWT_VERSION_STR" ) - if ( _VERSION_LINE ) - string ( REGEX REPLACE ".*define[ ]+QWT_VERSION_STR[ ]+\"(.*)\".*" "\\1" QWT_VERSION_STRING "${_VERSION_LINE}" ) - string ( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" QWT_MAJOR_VERSION "${QWT_VERSION_STRING}" ) - string ( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" QWT_MINOR_VERSION "${QWT_VERSION_STRING}" ) - string ( REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\3" QWT_PATCH_VERSION "${QWT_VERSION_STRING}" ) - endif () -endif () - - -# check version -set ( _QWT_VERSION_MATCH TRUE ) -if ( Qwt_FIND_VERSION AND QWT_VERSION_STRING ) - if ( Qwt_FIND_VERSION_EXACT ) - if ( NOT Qwt_FIND_VERSION VERSION_EQUAL QWT_VERSION_STRING ) - set ( _QWT_VERSION_MATCH FALSE ) - endif () - else () - if ( QWT_VERSION_STRING VERSION_LESS Qwt_FIND_VERSION ) - set ( _QWT_VERSION_MATCH FALSE ) - endif () - endif () -endif () - - -find_library ( QWT_LIBRARY - NAMES qwt qwt${QWT_MAJOR_VERSION} qwt-qt5 - HINTS ${QT_LIBRARY_DIR} -) - -set ( QWT_LIBRARIES ${QWT_LIBRARY} ) - -# try to guess root dir from include dir -if ( QWT_INCLUDE_DIR ) - string ( REGEX REPLACE "(.*)/include.*" "\\1" QWT_ROOT_DIR ${QWT_INCLUDE_DIR} ) -# try to guess root dir from library dir -elseif ( QWT_LIBRARY ) - string ( REGEX REPLACE "(.*)/lib[/|32|64].*" "\\1" QWT_ROOT_DIR ${QWT_LIBRARY} ) -endif () - -# handle the QUIETLY and REQUIRED arguments -include ( FindPackageHandleStandardArgs ) -if ( CMAKE_VERSION LESS 2.8.3 ) - find_package_handle_standard_args( Qwt DEFAULT_MSG QWT_LIBRARY QWT_INCLUDE_DIR _QWT_VERSION_MATCH ) -else () - find_package_handle_standard_args( Qwt REQUIRED_VARS QWT_LIBRARY QWT_INCLUDE_DIR _QWT_VERSION_MATCH VERSION_VAR QWT_VERSION_STRING ) -endif () - -mark_as_advanced ( - QWT_LIBRARY - QWT_LIBRARIES - QWT_INCLUDE_DIR - QWT_INCLUDE_DIRS - QWT_MAJOR_VERSION - QWT_MINOR_VERSION - QWT_PATCH_VERSION - QWT_VERSION_STRING - QWT_ROOT_DIR -) - -# ======================================================================================================================================= -# CEA (ajout de la cible qwt pour le "cmake modern") : -set (QWT_TARGET "qwt::qwt") - -add_library (${QWT_TARGET} SHARED IMPORTED) -set_target_properties (qwt::qwt PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES ${QWT_INCLUDE_DIR} - IMPORTED_LOCATION ${QWT_LIBRARIES} -# INTERFACE_LINK_LIBRARIES ${QWT_LIBRARIES} # A priori on y met plutôt les dépendances, par exemple les libs Qt*. - ) -# Fin CEA -# ======================================================================================================================================= diff --git a/cmake/common.cmake b/cmake/common.cmake deleted file mode 100644 index 0606033..0000000 --- a/cmake/common.cmake +++ /dev/null @@ -1,33 +0,0 @@ -# -# common.cmake : instructions de compilation partagées par tous les CMakeLists.txt. -# include (version.cmake) ici ne fonctionnenent pas. Why ??? Ce fichier est déjà un -#fichier déjà inclus ??? -# => include version.cmake avant celui-ci. -# - -include (${CMAKE_SOURCE_DIR}/cmake/organization.cmake) - - -# Compilation : -add_definitions (-DQWT_CHARTS_VERSION="${QWT_CHARTS_VERSION}") -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}") -set (MANDATORY_CXX_OPTIONS -DMULTITHREADED_APPLICATION) - -if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug") - add_definitions (-DNDEBUG) -endif() - -# Edition des liens : -# A l'installation les RPATHS utilisés seront ceux spécifiés ci-dessous (liste -# de répertoires séparés par des ;) : -#set (CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${MT_INSTALL_SHLIB_DIR}) -#set (CMAKE_BUILD_WITH_INSTALL_RPATH ON) -# CMAKE_SKIP_BUILD_RPATH : avoir le rpath dans l'arborescence de developpement -set (CMAKE_SKIP_BUILD_RPATH OFF) -set (CMAKE_SKIP_RPATH OFF) - -set (CMAKE_SKIP_INSTALL_RPATH OFF) -#set (CMAKE_INSTALL_RPATH_USE_LINK_PATH ON) - -# ATTENTION : enleve le build tree du rpath : -#set (CMAKE_BUILD_WITH_INSTALL_RPATH ON) diff --git a/cmake/organization.cmake b/cmake/organization.cmake deleted file mode 100644 index a985c91..0000000 --- a/cmake/organization.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# -# organization.cmake : organisation des répertoires du projet -# - - -# L'installation : -# ================ - -# Le répertoire d'installation où sont mis les fichiers cmake à destination des utilisateurs (Module/cmake) : -set (CMAKE_CMAKE_ROOT_DIR ${CMAKE_INSTALL_LIBDIR}) -set (CMAKE_CMAKE_DIR ${CMAKE_CMAKE_ROOT_DIR}/${CURRENT_PACKAGE_NAME}/cmake) - -# Répertoire d'installation des bibliothèques (pour le RPATH) : -set (CMAKE_PACKAGE_RPATH_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) - -# Module:: -set (CMAKE_MODULE_NAMESPACE ${CURRENT_PACKAGE_NAME}::) - -# ModuleConfig -set (CMAKE_PACKAGE_CONFIG_NAME ${CURRENT_PACKAGE_NAME}Config) - -# ModuleTargets -set (CMAKE_PACKAGE_TARGETS_NAME ${CURRENT_PACKAGE_NAME}Targets) - -# Le répertoire des fichiers de configuration (lib/Module/cmake) : -set (CMAKE_PACKAGE_CONFIG_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CURRENT_PACKAGE_NAME}) - -# Le Fichier lib/Module/cmake/ModuleConfigVersion.cmake : -set (CMAKE_PACKAGE_CONFIG_FILE ${CMAKE_PACKAGE_CONFIG_DIR}/${CMAKE_PACKAGE_CONFIG_NAME}.cmake) - -# Le Fichier lib/Module/cmake/ModuleConfigVersion.cmake : -set (CMAKE_PACKAGE_VERSION_FILE ${CMAKE_PACKAGE_CONFIG_DIR}/${CMAKE_PACKAGE_CONFIG_NAME}Version.cmake) - -# Le Fichier lib/Module/cmake/ModuleTargets.cmake : -set (CMAKE_PACKAGE_TARGETS_BASENAME ${CMAKE_PACKAGE_TARGETS_NAME}.cmake) -set (CMAKE_PACKAGE_TARGETS_FILE ${CMAKE_PACKAGE_CONFIG_DIR}/${CMAKE_PACKAGE_TARGETS_BASENAME}) diff --git a/cmake/version.cmake b/cmake/version.cmake index 9b9624b..b929717 100644 --- 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 deleted file mode 100644 index 18209a8..0000000 --- a/cmake/workarounds.cmake +++ /dev/null @@ -1,83 +0,0 @@ -# -# workarounds.cmake -# -# Version 0.9.0 (27/09/2021) -# -# On définit ici les contournement aux problèmes de type build-system rencontrés dans le projet -# -include (CMakeDetermineCXXCompiler) - -message ("CMAKE_SYSTEM_NAME=" ${CMAKE_SYSTEM_NAME}) -find_program(CCC_OS_FOUND ccc_os) -if (CCC_OS_FOUND) - execute_process (COMMAND ccc_os OUTPUT_VARIABLE PLATFORM OUTPUT_STRIP_TRAILING_WHITESPACE) -endif (CCC_OS_FOUND) - -if (NOT PLATFORM) - execute_process (COMMAND lsb_release -d COMMAND awk "{print $2;}" OUTPUT_VARIABLE PLATFORM OUTPUT_STRIP_TRAILING_WHITESPACE) -endif (NOT PLATFORM) -message ("PLATFORM=" ${PLATFORM}) -message ("LANGUAGES=" ${LANGUAGES}) -message ("CXX=" ${CXX}) -message ("CMAKE_CXX_COMPILER=" ${CMAKE_CXX_COMPILER}) -message ("_CMAKE_TOOLCHAIN_PREFIX=" ${_CMAKE_TOOLCHAIN_PREFIX}) -message ("COMPILER_BASENAME=" ${COMPILER_BASENAME}) - -# Les répertoires de recherche par le compilateur des bibliothèques (a priori portable g++/icpc/clang++) : -# Méthode 1 (ça marche), en passant par bash : -#execute_process(COMMAND bash "-c" "LANG=C ${CMAKE_CXX_COMPILER} -print-search-dirs | sed -n 's/libraries: =//gp' | tr -s ':' ';'" OUTPUT_VARIABLE GNU_LIBRARIES_SEARCH_DIR) -#message ( "GNU_LIBRARIES_SEARCH_DIR=""${GNU_LIBRARIES_SEARCH_DIR}") -#find_library (STDC_LIB stdc++ PATHS ${GNU_LIBRARIES_SEARCH_DIR}) -# Méthode 2 : version cmake en pipant les commandes : -execute_process (COMMAND bash "-c" "LANG=C LC_ALL=C ${CMAKE_CXX_COMPILER} -print-search-dirs" COMMAND /usr/bin/sed -n "s/libraries: =//gp" COMMAND tr -s ":" ";" OUTPUT_VARIABLE LIBRARIES_SEARCH_DIR) -find_library (STDC_LIB stdc++ PATHS ${LIBRARIES_SEARCH_DIR}) - -# Aspects C++ : à affiner si nécessaire avec CMakeDetermineCXXCompiler.cmake -get_filename_component (CXX_BIN_DIR ${CMAKE_CXX_COMPILER} DIRECTORY) -get_filename_component (CXX_NAME ${CMAKE_CXX_COMPILER} NAME) -get_filename_component (CXX_ROOT_DIR ${CXX_BIN_DIR} DIRECTORY) -message (STATUS "CXX_ROOT_DIR=${CXX_ROOT_DIR} CXX_NAME=${CXX_NAME} CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}") -message (STATUS "CMAKE_COMPILER_IS_GNUCXX=" ${CMAKE_COMPILER_IS_GNUCXX}) - -# Ubuntu 17 et 18 : le RUNPATH n'est pas transitif => bien que runpath soit bien positionné (readelf -a executable | grep PATH) les libs utilisées de manière -# indirectes ne sont pas trouvées, et requiert un positionnement de la variable LD_LIBRARY_PATH. -# On force à utiliser un RPATH à l'édition des liens via l'option --disable-new-dtags du linker. A noter que transmise -# à la ligne de commande via -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--disable-new-dtags" cette option est curieusement ignorée. -#execute_process (COMMAND uname -a OUTPUT_VARIABLE FULL_PLATFORM OUTPUT_STRIP_TRAILING_WHITESPACE) -#string (REGEX MATCH "Ubuntu" IS_UBUNTU "${FULL_PLATFORM}") -#string (REGEX MATCH "(17|18)" IS_17_OR_18 "${FULL_PLATFORM}") -#message (STATUS "IS_UBUNTU=${IS_UBUNTU} IS_17_OR_18=${IS_17_OR_18}") -#if (IS_UBUNTU AND IS_17_OR_18) -if (PLATFORM STREQUAL "Ubuntu") - message (STATUS "PLATFORM UBUNTU 17 OR 18 DETECTED => USING RPATH INSTEADOF RUNPATH (${FULL_PLATFORM}") - add_link_options ("-Wl,--disable-new-dtags") -endif (PLATFORM STREQUAL "Ubuntu") - -if (CMAKE_COMPILER_IS_GNUCXX) - if ((PLATFORM STREQUAL "CentOS") OR (PLATFORM STREQUAL "RedHat-7-x86_64") OR (PLATFORM STREQUAL "Atos_7__x86_64") OR (PLATFORM STREQUAL "Rhel_8__x86_64")) -# On force le lien à cette version de la libstdc++. C'est nécessaire pour les wrappers swig/python lorsqu'on utilise directement -# le fichier python => chargement par python de _module.so qui, sans cette directive, chargement /lib64/libstdc++.so qui n'aura -# pas une ABI assez récente ... - message ("==> Ajout de la bibliothèque " ${STDC_LIB} " à l'édition des liens.") - link_libraries (${STDC_LIB}) - get_filename_component (STDC_LIB_DIR ${STDC_LIB} DIRECTORY) - message ("==> Ajout de du répertoire " ${STDC_LIB_DIR} " à l'édition des liens.") -# link_directories (BEFORE "${STDC_LIB_DIR}") - add_link_options ("-Wl,-rpath,${STDC_LIB_DIR}") # It works - endif ( ) - if (PLATFORM STREQUAL "Atos_7__x86_64") # Malgré include (FindThreads) et target_link_libraries (mylib PUBLIC Threads::Threads) le -lpthread ne suit pas toujours en cmake 3.14 - link_libraries (pthread) - endif() -elseif (CXX_NAME STREQUAL "icpc") - # Alors là c'est très fort. Il n'y a que du c++ et pourtant icpc 17.0.4.196 link avec les libs imf et autres, sans -Wl,-rpath - # Donc on rajoute ça ... - message (STATUS "CXX IS ICPC") - find_library (INTEL_LIB intlc PATHS ${LIBRARIES_SEARCH_DIR}) - if (INTEL_LIB) - get_filename_component (INTEL_LIB_DIR ${INTEL_LIB} DIRECTORY) - message ("==> Ajout de du répertoire " ${INTEL_LIB_DIR} " à l'édition des liens.") - add_link_options ("-Wl,-rpath,${INTEL_LIB_DIR}") # It works - endif (INTEL_LIB) -endif (CMAKE_COMPILER_IS_GNUCXX) - - diff --git a/src/QwtCharts/CMakeLists.txt b/src/QwtCharts/CMakeLists.txt index f168b0d..c246c80 100644 --- a/src/QwtCharts/CMakeLists.txt +++ b/src/QwtCharts/CMakeLists.txt @@ -1,12 +1,18 @@ set (CURRENT_PACKAGE_NAME "QwtCharts") set (CURRENT_PACKAGE_MACRO_NAME "QWT_CHARTS") +find_package (GUIToolkitsVariables) + +# The FindQwt.cmake file is deployed in GUIToolkitsVariables_CMAKE_DIR +# that is not the default location => set CMAKE_MODULE_PATH +list(APPEND CMAKE_MODULE_PATH ${GUIToolkitsVariables_CMAKE_DIR}) +find_package (Qwt REQUIRED) # définit ${QWT_TARGET} + include (${CMAKE_SOURCE_DIR}/cmake/version.cmake) -include (${CMAKE_SOURCE_DIR}/cmake/common.cmake) -include (${CMAKE_SOURCE_DIR}/cmake/FindQwt.cmake) # définit ${QWT_TARGET} -include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake) +include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake) +include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake) -find_package (QtUtil 5 REQUIRED) +find_package (QtUtil 6 REQUIRED) find_package(Qt5Core 5 NO_CMAKE_SYSTEM_PATH) # In order to enable moc ... file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h) @@ -80,6 +86,3 @@ install (EXPORT ${CMAKE_PACKAGE_TARGETS_NAME} # Copie des fichiers QwtChartsConfig.cmake et QwtChartsConfigVersion.cmake dans prefix/lib/QwtCharts/cmake : install (FILES ${CMAKE_PACKAGE_CONFIG_FILE} ${CMAKE_PACKAGE_VERSION_FILE} DESTINATION ${ConfigPackageLocation} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ) -# On installe également FindQwt.cmake qui met à disposition des utilisateurs -# le nécessaire pour utiliser (de manière indirecte) Qwt. -install(FILES ${CMAKE_SOURCE_DIR}/cmake/FindQwt.cmake DESTINATION ${ConfigPackageLocation} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ) diff --git a/src/QwtCharts/cmake/QwtChartsConfig.cmake.in b/src/QwtCharts/cmake/QwtChartsConfig.cmake.in index 4568fd5..33587f0 100644 --- a/src/QwtCharts/cmake/QwtChartsConfig.cmake.in +++ b/src/QwtCharts/cmake/QwtChartsConfig.cmake.in @@ -1,8 +1,13 @@ include(CMakeFindDependencyMacro) +find_dependency (GUIToolkitsVariables) find_dependency (QtUtil) +# The FindQwt.cmake file is deployed in GUIToolkitsVariables_CMAKE_DIR +# that is not the default location => set CMAKE_MODULE_PATH +list(APPEND CMAKE_MODULE_PATH ${GUIToolkitsVariables_CMAKE_DIR}) +find_dependency (Qwt) + @PACKAGE_INIT@ -include (${CMAKE_CURRENT_LIST_DIR}/FindQwt.cmake) set (QwtCharts_VERSION @QWT_CHARTS_VERSION@) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 3af3330..00d6454 100644 --- a/src/tests/CMakeLists.txt +++ b/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) diff --git a/versions.txt b/versions.txt index c6cec41..c48e073 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,36 @@ A FAIRE : Affichage optionnel des symboles => option dans les panneaux. +Version 5.2.0 : 23/06/23 +=============== + +Sortie du projet GUIToolkits. + +Les includes (FindQwt.cmake) sont remplacés par des find_package/dependency (Qwt) + + +Version 5.1.1 : 06/06/23 +=============== + +Retouches cmake (dépendance GUIToolkitsVariables pour accéder à FindQwt.cmake). + + +Version 5.1.0 : 31/03/23 +=============== + +Portage GitHub environnement podman/spack/tests CI. + + +Version 5.0.0 : 10/01/23 +=============== + +Intégration au projet GUIToolkits. + + Version 4.4.13 : 25/11/22 ================ -Un peu de nettoyage (hors sources). +Suppression répertoire module. Version 4.4.12 : 09/02/22 @@ -22,7 +48,7 @@ Utilisation de NO_DEFAULT_PATH lors des find_package(Qt 5 ...) Version 4.4.10 : 10/09/21 ================ -Suppression de mini gros-mots et de balises EXPURGE. +Divers nettoyage. Version 4.4.9 : 24/08/21 @@ -87,10 +113,7 @@ Version 4.4.0 : 04/06/20 R =============== Fin réintégration en environnement CEA suite confinement covid-19. -Procédure d'exportation ouverte des sources : cible export avec script export.sh (réalisation d'un tarball filtré, -sans gros mots, reposant sur la commande expurge réalisée à cet effet et sur la commande tar). -cmake/workaround.cmake utilise maintenant la commande lsb_release -d à la place du tandem uname/commande locale. A -finaliser sur calculateur. +Procédure d'exportation ouverte des sources : cible export avec script export.sh Version 4.3.0 : 06/04/20