Skip to content

Commit 0d2a4c5

Browse files
committed
COMP: Disable vendored Cleaver lib testing for CMake 4.x compat
The vendored Cleaver lib's bundled googletest (CIBC-Internal/googletest ExternalProject) uses cmake_minimum_required < 3.5 which CMake >= 4.0 rejects. Disable BUILD_TESTING for the vendored lib on all platforms (was previously only disabled for WASI/Emscripten). The ITK module has its own tests that are unaffected.
1 parent e0104da commit 0d2a4c5

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/wasm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ jobs:
5959
browser: firefox
6060
start: npm start
6161

62-
- uses: actions/upload-artifact@v3
62+
- uses: actions/upload-artifact@v4
6363
if: failure()
6464
with:
6565
name: cypress-screenshots
6666
path: wasm/typescript/cypress/screenshots
6767

68-
- uses: actions/upload-artifact@v3
68+
- uses: actions/upload-artifact@v4
6969
if: always()
7070
with:
7171
name: cypress-videos

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ if(DEFINED BUILD_TESTING)
1414
else()
1515
set(_itk_build_testing OFF) # Default
1616
endif()
17-
if(WASI OR EMSCRIPTEN)
18-
# Cleaver lib vendored GTest incompatibility
19-
set(BUILD_TESTING OFF CACHE BOOL "Build testing code" FORCE)
20-
endif()
17+
# Disable testing for the vendored Cleaver lib — its bundled googletest
18+
# (via CIBC-Internal/googletest ExternalProject) uses cmake_minimum_required
19+
# < 3.5 which CMake >= 4.0 rejects. The ITK module has its own tests.
20+
set(BUILD_TESTING OFF CACHE BOOL "Build testing code" FORCE)
2121
if (CMAKE_CXX_COMPILER_IS_GNUCXX)
2222
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
2323
endif()

0 commit comments

Comments
 (0)