Skip to content

Commit ac6cb3f

Browse files
lelandaisblelandaisb
authored
Sync1 (#2)
* Version 8.4.0 : sortie du projet GUIToolkits. * Version 8.4.0 du 21/06/23. Sortie de GUIToolkits. * New CI workflows --------- Co-authored-by: Charles PIGNEROL <>
1 parent 9212708 commit ac6cb3f

File tree

13 files changed

+129
-212
lines changed

13 files changed

+129
-212
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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +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
14-
with:
15-
test-link-options: "-DQVTK_WIDGET:BOOL=ON -DUSE_OPENGL_BACKEND:BOOL=ON"

‎CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ cmake_minimum_required(VERSION 3.12)
44
project (QtVtk CXX C)
55

66
include (GNUInstallDirs)
7+
8+
find_package (GUIToolkitsVariables)
9+
710
include (cmake/version.cmake)
8-
include (cmake/common.cmake)
11+
include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
912

1013

1114
set (QtVtk_VERSION ${QT_VTK_VERSION})
1215

1316
set (CMAKE_VERBOSE_MAKEFILE ON)
1417
option (BUILD_SHARED_LIBS "Creation de bibliotheques dynamiques (defaut : ON)" ON)
18+
1519
add_subdirectory (src)

‎cmake/common.cmake

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

‎cmake/organization.cmake

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

‎cmake/qtvtk_common.cmake

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
include (${GUIToolkitsVariables_CMAKE_DIR}/organization.cmake)
2+
3+
4+
# Compilation :
5+
add_definitions (-DQT_VTK_VERSION="${QT_VTK_VERSION}")
6+
7+
8+
# Rem : des flags VTK importants sont hérités de VtkContrib :
9+
if (QVTK_WIDGET)
10+
message (STATUS "=============== > Utilisation de la classe QVTKWidget (obsolète, VTK < 8) pour afficher la scène.")
11+
if (NOT VTK_7)
12+
message (FATAL_ERROR "== > Utilisation de la classe QVTKWidget impossible en dehors de VTK 7.") # Versions < VTK 7 non maintenues
13+
endif (NOT VTK_7)
14+
if (USE_OPENGL_BACKEND)
15+
set (MANDATORY_VTK_OPTIONS -DVTK_WIDGET -DEXPORT_VTK_MULTIBLOCK_DATASETS)
16+
else (USE_OPENGL_BACKEND)
17+
set (MANDATORY_VTK_OPTIONS -DVTK_WIDGET2 -DEXPORT_VTK_MULTIBLOCK_DATASETS)
18+
endif (USE_OPENGL_BACKEND)
19+
else (QVTK_WIDGET)
20+
if (VTK_7)
21+
message (STATUS "=============== > Utilisation de la classe QVTKWidget2 pour afficher la scène.")
22+
set (MANDATORY_VTK_OPTIONS -DVTK_WIDGET2 -DEXPORT_VTK_MULTIBLOCK_DATASETS)
23+
else (VTK_7)
24+
message (STATUS "=============== > Utilisation de la classe QVTKOpenGLWidget pour afficher la scène.")
25+
set (MANDATORY_VTK_OPTIONS -DEXPORT_VTK_MULTIBLOCK_DATASETS)
26+
endif (VTK_7)
27+
endif (QVTK_WIDGET)
28+
set (MANDATORY_VTK_PRIVATE_OPTIONS -DPATCH_VTK_MATH_SOLVE_LINEAR_SYSTEM)
29+

‎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 (QT_VTK_MAJOR_VERSION "7")
6-
set (QT_VTK_MINOR_VERSION "14")
7-
set (QT_VTK_RELEASE_VERSION "8")
5+
set (QT_VTK_MAJOR_VERSION "8")
6+
set (QT_VTK_MINOR_VERSION "4")
7+
set (QT_VTK_RELEASE_VERSION "0")
88
set (QT_VTK_VERSION ${QT_VTK_MAJOR_VERSION}.${QT_VTK_MINOR_VERSION}.${QT_VTK_RELEASE_VERSION})
99

1010

‎cmake/workarounds.cmake

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

‎src/QtVtk/CMakeLists.txt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
set (CURRENT_PACKAGE_NAME "QtVtk")
22
set (CURRENT_PACKAGE_MACRO_NAME "QT_VTK")
33

4+
find_package (GUIToolkitsVariables)
5+
46
include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
5-
include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
6-
include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
7+
include (${GUIToolkitsVariables_CMAKE_DIR}/common.cmake)
8+
include (${GUIToolkitsVariables_CMAKE_DIR}/workarounds.cmake)
79

8-
find_package (VtkContrib 4 REQUIRED)
9-
find_package (QtUtil 5 REQUIRED)
10-
find_package(Qt5Core NO_CMAKE_SYSTEM_PATH) # In order to enable moc ...
10+
find_package (VtkContrib 5 REQUIRED)
11+
include (${CMAKE_SOURCE_DIR}/cmake/qtvtk_common.cmake) # Après VtkContrib qui positionne les variables VTK_7, VTK_8 et VTK_9
12+
find_package (QtUtil 6 REQUIRED)
13+
find_package(Qt5Core NO_CMAKE_SYSTEM_PATH) # In order to enable moc ...
1114
if (VTK_9)
12-
find_package(VTK COMPONENTS GUISupportQt IOExportGL2PS FiltersExtraction)
15+
find_package (VTK COMPONENTS GUISupportQt IOExportGL2PS FiltersExtraction)
1316
endif (VTK_9)
1417

1518
file (GLOB HEADERS public/${CURRENT_PACKAGE_NAME}/*.h)
@@ -34,10 +37,13 @@ if (VTK_9)
3437
elseif (VTK_8)
3538
target_link_libraries (QtVtk PUBLIC ${VTK_LIBRARIES})
3639
else (VTK_8) # => VTK_7
40+
if (NOT QVTK_WIDGET)
41+
message (FATAL_ERROR "==> UTILISEZ -DQVTK_WIDGET:BOOL=ON EN VTK 7 A LA LIGNE DE COMMANDE (vtkGenericOpenGLRenderWindow non disponible en VTK 7).")
42+
endif (NOT QVTK_WIDGET)
3743
if (USE_OPENGL_BACKEND)
3844
target_link_libraries (QtVtk PUBLIC vtkGUISupportQt) # OpenGL backend, QVTKWidget
3945
else (USE_OPENGL_BACKEND)
40-
target_link_libraries (QtVtk PUBLIC vtkGUISupportQtOpenGL) # OpenGL2 backend, QVTKWidget2
46+
target_link_libraries (QtVtk PUBLIC vtkGUISupportQtOpenGL) # OpenGL2 backend, vtkGenericOpenGLRenderWindow (voire QVTKWidget2)
4147
endif (USE_OPENGL_BACKEND)
4248
endif(VTK_9)
4349

0 commit comments

Comments
 (0)