Skip to content

Commit 5a20afe

Browse files
lelandaisblelandaisb
authored
Sync1 (#1)
* Version 5.4.0 : sortie du projet GUIToolkits. * Version 5.4.0 du 21/06/23. Sortie de GUIToolkits. * New CI workflows --------- Co-authored-by: Charles PIGNEROL <>
1 parent 8e8f57c commit 5a20afe

18 files changed

+433
-275
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: "-DVTK_7:BOOL=ON -DUSE_OPENGL_BACKEND:BOOL=ON"

‎CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ cmake_minimum_required(VERSION 3.12)
44
project (VtkContrib 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
set (VtkContrib_VERSION ${VTK_CONTRIB_VERSION})
1114

12-
# Partie normale de cmake : réalisation de Makefiles ...
13-
14-
# Ici et pas ailleurs : CMAKE_VERBOSE_MAKEFILE
1515
set (CMAKE_VERBOSE_MAKEFILE ON)
1616
option (BUILD_SHARED_LIBS "Creation de bibliotheques dynamiques (defaut : ON)" ON)
1717

‎cmake/common.cmake‎

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

‎cmake/export.cmake‎

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

‎cmake/organization.cmake‎

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

‎cmake/packaging.cmake‎

Lines changed: 0 additions & 24 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 (VTK_CONTRIB_MAJOR_VERSION "4")
6-
set (VTK_CONTRIB_MINOR_VERSION "8")
7-
set (VTK_CONTRIB_RELEASE_VERSION "4")
5+
set (VTK_CONTRIB_MAJOR_VERSION "5")
6+
set (VTK_CONTRIB_MINOR_VERSION "4")
7+
set (VTK_CONTRIB_RELEASE_VERSION "0")
88
set (VTK_CONTRIB_VERSION ${VTK_CONTRIB_MAJOR_VERSION}.${VTK_CONTRIB_MINOR_VERSION}.${VTK_CONTRIB_RELEASE_VERSION})
99

1010

‎cmake/vtkcontrib_common.cmake‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
find_package (GUIToolkitsVariables)
2+
3+
include (${GUIToolkitsVariables_CMAKE_DIR}/common_vtk.cmake) # Positionne VTK_7, VTK_8, VTK_9
4+
5+
# Compilation :
6+
add_definitions (-DVTK_CONTRIB_VERSION="${VTK_CONTRIB_VERSION}")
7+
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}")
8+
if (VTK_7)
9+
message (STATUS "========================================= UTILISATION DE VTK 7 =========================================")
10+
if (USE_OPENGL_BACKEND)
11+
set (MANDATORY_CXX_OPTIONS -DVTKGL -DUSE_OPENGL_BACKEND -DVTK_7) # Public
12+
set (MANDATORY_VTK_OPTIONS "-DvtkRenderingCore_AUTOINIT=3(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingOpenGL)" "-DvtkIOExport_AUTOINIT=1(vtkIOExportOpenGL)")
13+
else (USE_OPENGL_BACKEND)
14+
set (MANDATORY_CXX_OPTIONS -DVTKGL -DUSE_OPENGL2_BACKEND -DVTK_7) # Public
15+
set (MANDATORY_VTK_OPTIONS "-DvtkRenderingCore_AUTOINIT=3(vtkInteractionStyle,vtkRenderingFreeType,vtkRenderingOpenGL2)" "-DvtkIOExport_AUTOINIT=1(vtkIOExportOpenGL2)")
16+
endif (USE_OPENGL_BACKEND)
17+
set (MANDATORY_PRIVATE_VTK_OPTIONS -DPATCH_VTK_MATH_SOLVE_LINEAR_SYSTEM)
18+
elseif (VTK_8)
19+
message (STATUS "========================================= UTILISATION DE VTK 8 =========================================")
20+
if (USE_OPENGL_BACKEND)
21+
message (FATAL_ERROR "==> Backend OpenGL (1) incompatible avec VTK 8.")
22+
endif (USE_OPENGL_BACKEND)
23+
set (MANDATORY_CXX_OPTIONS -DVTKGL -DUSE_OPENGL2_BACKEND -DVTK_8) # Public
24+
set (MANDATORY_VTK_OPTIONS -DPATCH_VTK_MATH_SOLVE_LINEAR_SYSTEM)
25+
elseif (VTK_9)
26+
message (STATUS "========================================= UTILISATION DE VTK 9 =========================================")
27+
if (USE_OPENGL_BACKEND)
28+
message (FATAL_ERROR "==> Backend OpenGL (1) incompatible avec VTK 9.")
29+
endif (USE_OPENGL_BACKEND)
30+
set (MANDATORY_CXX_OPTIONS -DVTKGL -DUSE_OPENGL2_BACKEND -DVTK_9) # Public
31+
set (MANDATORY_VTK_OPTIONS -DPATCH_VTK_MATH_SOLVE_LINEAR_SYSTEM)
32+
else (VTK_7)
33+
message (STATUS "========================================= VERSION DE VTK NON DEFINIE =========================================")
34+
message (FATAL_ERROR "==> UTILISEZ -DVTK_7:BOOL=ON OU -DVTK_8:BOOL=ON OU -DVTK_9:BOOL=ON A LA LIGNE DE COMMANDE")
35+
endif (VTK_7)
36+
37+

0 commit comments

Comments
 (0)