Merge topic 'set-testing-flag-in-cache'

688a5c0e wrapping: use -pthread flag for vtkWrapSerDes and vtkWrapHierarchy
e203a00b ci: cache flags to disable testing and threads in wasm no-threads config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11431

.gitlab/ci/configure_wasm32_emscripten_linux.cmake

-include("${CMAKE_CURRENT_LIST_DIR}/configure_wasm_common.cmake")
+# Disable testing for non-threaded wasm builds because if testing is enabled,
+# VTK cmake enables threads.
+set(VTK_BUILD_TESTING OFF CACHE STRING "")
+# Ensure threads are not enabled.
+set(VTK_WEBASSEMBLY_THREADS OFF CACHE BOOL "")
 
-# Disable testing for non-threaded wasm builds because threads are crucial for test data loading.
-set(VTK_BUILD_TESTING OFF)
+include("${CMAKE_CURRENT_LIST_DIR}/configure_wasm_common.cmake")

.gitlab/ci/configure_wasm64_emscripten_linux.cmake

-include("${CMAKE_CURRENT_LIST_DIR}/configure_wasm_common.cmake")
-
+# Disable testing for non-threaded wasm builds because if testing is enabled,
+# VTK cmake enables threads.
+set(VTK_BUILD_TESTING OFF CACHE STRING "")
+# Ensure threads are not enabled.
+set(VTK_WEBASSEMBLY_THREADS OFF CACHE BOOL "")
 set(VTK_WEBASSEMBLY_64_BIT ON CACHE BOOL "")
-
-# Disable testing for non-threaded wasm builds because threads are crucial for test data loading.
-set(VTK_BUILD_TESTING OFF)
+include("${CMAKE_CURRENT_LIST_DIR}/configure_wasm_common.cmake")

Wrapping/Tools/CMakeLists.txt

@@ -52,6 +52,9 @@ set(_vtk_module_no_namespace_abi_mangling ON)
 vtk_module_add_module("${ns}::WrappingTools"
   SOURCES ${sources}
   HEADERS ${headers})
+vtk_module_compile_options("${ns}::WrappingTools"
+  PRIVATE
+    "-pthread")
 
 if (NOT TARGET "${ns}::WrapHierarchy")
   vtk_module_add_executable(WrapHierarchy
@@ -62,10 +65,16 @@ if (NOT TARGET "${ns}::WrapHierarchy")
     PRIVATE
       "${ns}::WrappingTools")
   if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    target_compile_options(WrapHierarchy
+      PRIVATE
+        "-pthread")
     # allows vtkWrapHierarchy to access host file system for headers, generated sources, etc.
     # permit memory growth to generate arbitrary sized hierarchy files.
     target_link_options(WrapHierarchy
       PRIVATE
+        "-pthread"
+        # Remove after https://github.com/WebAssembly/design/issues/1271 is closed
+        "-Wno-pthreads-mem-growth"
         "SHELL:-s ALLOW_MEMORY_GROWTH=1"
         "SHELL:-s NODERAWFS=1")
   endif ()
@@ -142,8 +151,14 @@ if (NOT TARGET WrapSerDes)
   if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     # allows WrapSerDes to access host file system for headers, generated sources, etc.
     # permit memory growth to generate arbitrary sized vtkClassNameSerDes.cxx files
+    target_compile_options(WrapSerDes
+      PRIVATE
+        "-pthread")
     target_link_options(WrapSerDes
       PRIVATE
+        "-pthread"
+        # Remove after https://github.com/WebAssembly/design/issues/1271 is closed
+        "-Wno-pthreads-mem-growth"
         "SHELL:-s ALLOW_MEMORY_GROWTH=1"
         "SHELL:-s NODERAWFS=1")
   endif ()