Skip to content

Commit 9ea9278

Browse files
authored
Sync1 (#1)
* Version 6.1.0 : sortie du projet GUIToolkits. * New CI workflows * New Python dependency deployment --------- Co-authored-by: Charles PIGNEROL <>
1 parent f727280 commit 9ea9278

18 files changed

Lines changed: 98 additions & 268 deletions

‎.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: "-DUSE_PYTHON_3:BOOL=ON"

‎CMakeLists.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ cmake_minimum_required (VERSION 3.14)
33
project (PythonUtil 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
set (PythonUtil_VERSION ${PYTHON_UTIL_VERSION})
1013

11-
# Ici et pas ailleurs : CMAKE_VERBOSE_MAKEFILE
1214
set (CMAKE_VERBOSE_MAKEFILE ON)
1315
option (BUILD_SHARED_LIBS "Creation de bibliotheques dynamiques (defaut : ON)" ON)
1416

15-
add_subdirectory (src)
17+
enable_testing ( )
1618

17-
enable_testing()
19+
add_subdirectory (src)

‎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/python_binding.cmake‎

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

‎cmake/version.cmake‎

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

5-
set (PYTHON_UTIL_MAJOR_VERSION "5")
6-
set (PYTHON_UTIL_MINOR_VERSION "6")
7-
set (PYTHON_UTIL_RELEASE_VERSION "6")
5+
set (PYTHON_UTIL_MAJOR_VERSION "6")
6+
set (PYTHON_UTIL_MINOR_VERSION "2")
7+
set (PYTHON_UTIL_RELEASE_VERSION "0")
88
set (PYTHON_UTIL_VERSION ${PYTHON_UTIL_MAJOR_VERSION}.${PYTHON_UTIL_MINOR_VERSION}.${PYTHON_UTIL_RELEASE_VERSION})
99

‎cmake/workarounds.cmake‎

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

‎src/CMakeLists.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
add_subdirectory (PythonUtil)
2-
add_subdirectory (PythonScriptingTest)
3-
add_subdirectory (tests)
1+
enable_testing ( )
42

5-
enable_testing()
3+
add_subdirectory (PythonUtil)
4+
if (BUILD_TESTS)
5+
add_subdirectory (PythonScriptingTest)
6+
add_subdirectory (tests)
7+
endif ( )

0 commit comments

Comments
 (0)