[med-svn] [Git][med-team/camitk][master] Closes: #1103471
Emmanuel Promayon (@promayon-guest)
gitlab at salsa.debian.org
Sat Apr 19 17:01:53 BST 2025
Emmanuel Promayon pushed to branch master at Debian Med / camitk
Commits:
6bf6d967 by Emmanuel Promayon at 2025-04-19T17:28:47+02:00
Closes: #1103471
- - - - -
6 changed files:
- debian/changelog
- debian/patches/0005-use-VTK-modules-to-remove-useless-java-dependencies.patch
- + debian/patches/0006-FIXED-building-without-test.patch
- debian/patches/0007-disable-graph-generation-in-api.patch
- debian/patches/0210-vtk-9.3.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+camitk (5.2.0-5) UNRELEASED; urgency=medium
+
+ [Emmanuel Promayon]
+ * Adding safeguards around ctest instructions. (Closes: #1103471)
+
+ -- Emmanuel Promayon <Emmanuel.Promayon at univ-grenoble-alpes.fr> Sat, 19 Apr 2025 17:23:55 +0200
+
camitk (5.2.0-4) unstable; urgency=medium
* use VTK9 modules to remove unneeded java dependencies
=====================================
debian/patches/0005-use-VTK-modules-to-remove-useless-java-dependencies.patch
=====================================
@@ -3,7 +3,6 @@ Date: Fri, 14 Mar 2025 19:08:28 +0100
Subject: use VTK modules to remove useless java dependencies
Forwarded: not-needed
-
---
.../cepgenerator/testing/cepgenerator-test.sh | 4 --
sdk/applications/config/testing/config-test.sh | 4 --
=====================================
debian/patches/0006-FIXED-building-without-test.patch
=====================================
@@ -0,0 +1,66 @@
+From: Emmanuel Promayon <Emmanuel.Promayon at univ-grenoble-alpes.fr>
+Date: Sat, 19 Apr 2025 17:21:23 +0200
+Subject: FIXED building without test
+
+---
+ CMakeLists.txt | 1 -
+ sdk/cmake/modules/macros/camitk/test/CamiTKDisableTests.cmake | 5 +++++
+ sdk/cmake/modules/macros/camitk/test/CamiTKTestsRequirement.cmake | 2 +-
+ tutorials/components/abort/CMakeLists.txt | 6 ++++--
+ 4 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 67e24e8..6d02783 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,7 +9,6 @@ project(camitkcommunityedition)
+
+ # Allow testing of the whole camitk-communityedition project
+ include(CTest)
+-enable_testing()
+
+ set(CAMITK_PROJECT_NAME "CamiTK")
+ # The current version of CamiTK is defined in a separate file to avoid conflict/problem when merging
+diff --git a/sdk/cmake/modules/macros/camitk/test/CamiTKDisableTests.cmake b/sdk/cmake/modules/macros/camitk/test/CamiTKDisableTests.cmake
+index 74ced46..651cc0e 100644
+--- a/sdk/cmake/modules/macros/camitk/test/CamiTKDisableTests.cmake
++++ b/sdk/cmake/modules/macros/camitk/test/CamiTKDisableTests.cmake
+@@ -47,6 +47,11 @@ macro(camitk_disable_tests)
+ set(multiValueArgs TESTS)
+ cmake_parse_arguments(CAMITK_DISABLE_TESTS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
++ if (NOT BUILD_TESTING)
++ message(STATUS "Build testing is off, no test to disable for ${CAMITK_DISABLE_TESTS_TESTS}")
++ return()
++ endif()
++
+ foreach(TEST_NAME ${CAMITK_DISABLE_TESTS_TESTS})
+ # CMake < 3.9 did not have the DISABLED test property. Use WILL_FAIL instead
+ if(${CMAKE_VERSION} VERSION_LESS "3.9")
+diff --git a/sdk/cmake/modules/macros/camitk/test/CamiTKTestsRequirement.cmake b/sdk/cmake/modules/macros/camitk/test/CamiTKTestsRequirement.cmake
+index ed6d746..4a0c3bb 100644
+--- a/sdk/cmake/modules/macros/camitk/test/CamiTKTestsRequirement.cmake
++++ b/sdk/cmake/modules/macros/camitk/test/CamiTKTestsRequirement.cmake
+@@ -169,7 +169,7 @@ macro(camitk_tests_requirement)
+
+ # -- disable tests if the requirement is not met
+ string(REPLACE ";" " " CAMITK_TESTS_REQUIREMENT_TESTS_STRING "${CAMITK_TESTS_REQUIREMENT_TESTS}")
+- if(NOT ${REQUIRES_EVAL})
++ if(NOT ${REQUIRES_EVAL} AND BUILD_TESTING)
+ foreach(TEST_NAME ${CAMITK_TESTS_REQUIREMENT_TESTS})
+ # CMake < 3.9 did not have the DISABLED test property. Use WILL_FAIL instead
+ if(${CMAKE_VERSION} VERSION_LESS "3.9")
+diff --git a/tutorials/components/abort/CMakeLists.txt b/tutorials/components/abort/CMakeLists.txt
+index f51dcff..afbb198 100644
+--- a/tutorials/components/abort/CMakeLists.txt
++++ b/tutorials/components/abort/CMakeLists.txt
+@@ -8,5 +8,7 @@ camitk_extension(COMPONENT_EXTENSION
+ # --------------------------------
+ # --- Specific test management ---
+ # --------------------------------
+-# this is a guaranted test failure. Therefore test fail is correct.
+-set_tests_properties(component-abort-level1-1 PROPERTIES WILL_FAIL true)
++if (BUILD_TESTING)
++ # this is a guaranted test failure. Therefore test fail is correct.
++ set_tests_properties(component-abort-level1-1 PROPERTIES WILL_FAIL true)
++endif()
=====================================
debian/patches/0007-disable-graph-generation-in-api.patch
=====================================
@@ -1,6 +1,7 @@
From: Emmanuel Promayon <Emmanuel.Promayon at univ-grenoble-alpes.fr>
Date: Fri, 28 Feb 2025 10:46:49 +0100
Subject: Disable graph generation in apidoc
+
Generating graphs in apidoc takes a lot of resources.
It is not particularly needed as it is available
online and can be generated from the sources if
=====================================
debian/patches/0210-vtk-9.3.patch
=====================================
@@ -1,10 +1,11 @@
-Subject: Followup with deprecated vtkConfigure.h header, renaming of SetQuadQualityMeasureToMaxEdgeRatios into SetQuadQualityMeasureToMaxEdgeRatio and removal of SetTetQualityMeasureToAspectBeta
From: Gianfranco Costamagna <locutusofborg at debian.org>
-Last-Update: 2024-06-20
-
-Date: Fri, 28 Feb 2025 10:46:49 +0100
-
+Date: Sat, 19 Apr 2025 17:13:59 +0200
+Subject: Followup with deprecated vtkConfigure.h header,
+ renaming of SetQuadQualityMeasureToMaxEdgeRatios into
+ SetQuadQualityMeasureToMaxEdgeRatio and removal of
+ SetTetQualityMeasureToAspectBeta
+Last-Update: 2024-06-20
---
sdk/actions/mesh/basicmesh/MeshQuality.cpp | 18 +++++++++---------
sdk/components/vtkimage/RawDataDialog.cpp | 4 +++-
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@
0003-FIX-FTBFS-disabling-culprit-itk-test-for-now.patch
0004-remove-XML-output-to-improve-reproducibility.patch
0005-use-VTK-modules-to-remove-useless-java-dependencies.patch
+0006-FIXED-building-without-test.patch
View it on GitLab: https://salsa.debian.org/med-team/camitk/-/commit/6bf6d967d40c817bf116b36e7bcc7df1d5b1a2a4
--
View it on GitLab: https://salsa.debian.org/med-team/camitk/-/commit/6bf6d967d40c817bf116b36e7bcc7df1d5b1a2a4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20250419/8eee3991/attachment-0001.htm>
More information about the debian-med-commit
mailing list