Skip to content

Commit 9064fb7

Browse files
authored
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 <>
1 parent 5251405 commit 9064fb7

File tree

13 files changed

+72
-347
lines changed

13 files changed

+72
-347
lines changed

.github/workflows/cmake-ci.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/workflows/make-release.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Make release
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
8+
jobs:
9+
call:
10+
name: Call check version CI
11+
uses: LIHPC-Computational-Geometry/lihpccg-ci/.github/workflows/make-release-reusable.yml@main

.github/workflows/spack-ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
name: Spack CI
22

33
on:
4-
workflow_dispatch:
54
push:
6-
branches: [ main ]
5+
branches:
6+
- '**'
77
pull_request:
8-
branches: [ main ]
8+
# Allows you to run this workflow manually
9+
workflow_dispatch:
910

1011
jobs:
1112
call:
12-
name: Call Spack reusable workflow
13+
name: Call Spack CI
1314
uses: LIHPC-Computational-Geometry/lihpccg-ci/.github/workflows/spack-reusable.yml@main

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ cmake_minimum_required(VERSION 3.12)
33
project (QwtCharts CXX)
44

55
include (GNUInstallDirs)
6+
7+
find_package (GUIToolkitsVariables)
8+
69
include (cmake/version.cmake)
7-
include (cmake/common.cmake)
10+
include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
811

912

1013
set (QwtCharts_VERSION ${QWT_CHARTS_VERSION})

cmake/FindQwt.cmake

Lines changed: 0 additions & 156 deletions
This file was deleted.

cmake/common.cmake

Lines changed: 0 additions & 33 deletions
This file was deleted.

cmake/organization.cmake

Lines changed: 0 additions & 36 deletions
This file was deleted.

cmake/version.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# version.cmake : version du projet
33
#
44

5-
set (QWT_CHARTS_MAJOR_VERSION "4")
6-
set (QWT_CHARTS_MINOR_VERSION "4")
7-
set (QWT_CHARTS_RELEASE_VERSION "13")
5+
set (QWT_CHARTS_MAJOR_VERSION "5")
6+
set (QWT_CHARTS_MINOR_VERSION "2")
7+
set (QWT_CHARTS_RELEASE_VERSION "0")
88
set (QWT_CHARTS_VERSION ${QWT_CHARTS_MAJOR_VERSION}.${QWT_CHARTS_MINOR_VERSION}.${QWT_CHARTS_RELEASE_VERSION})
99

1010

cmake/workarounds.cmake

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)