feat(cxx): bump C++ standard to 20

thewtex · thewtex · commit 2f6313779f33 · 2024-06-03T17:04:10.000-04:00
For glaze.

And CMake minimum required to 3.25.1 (Ubuntu 24.04 version).
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.16.3)
+cmake_minimum_required(VERSION 3.25.1)
 project(WebAssemblyInterface)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 if(POLICY CMP0135)
   cmake_policy(SET CMP0135 NEW)
diff --git a/docs/cxx/tutorial/hello_pipeline.md b/docs/cxx/tutorial/hello_pipeline.md
@@ -107,7 +107,7 @@ cmake_minimum_required(VERSION 3.16)
 project(hello-pipeline)
 
 # Use C++17 or newer with itk-wasm
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 # We always want to build against the WebAssemblyInterface module.
 set(itk_components
diff --git a/docs/cxx/tutorial/inputs_outputs.md b/docs/cxx/tutorial/inputs_outputs.md
@@ -110,7 +110,7 @@ cmake_minimum_required(VERSION 3.16)
 project(inputs-outputs)
 
 # Use C++17 or newer with itk-wasm
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 # We always want to build against the WebAssemblyInterface module.
 set(itk_components
diff --git a/examples/different-input-types/CMakeLists.txt b/examples/different-input-types/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
 project(different-input-types)
 
 # Use C++17 or newer with itk-wasm
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 # We always want to build against the WebAssemblyInterface module.
 set(itk_components
diff --git a/examples/hello-pipeline/CMakeLists.txt b/examples/hello-pipeline/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
 project(hello-pipeline)
 
 # Use C++17 or newer with itk-wasm
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 # We always want to build against the WebAssemblyInterface module.
 set(itk_components
diff --git a/examples/inputs-outputs/CMakeLists.txt b/examples/inputs-outputs/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
 project(inputs-outputs)
 
 # Use C++17 or newer with itk-wasm
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 # We always want to build against the WebAssemblyInterface module.
 set(itk_components
diff --git a/examples/mean-squares-versor-registration/CMakeLists.txt b/examples/mean-squares-versor-registration/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
 project(mean-squares-versor-registration)
 
 # Use C++17 or newer with itk-wasm
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 # We always want to build against the WebAssemblyInterface module.
 set(itk_components
diff --git a/packages/compare-images/CMakeLists.txt b/packages/compare-images/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 project(itkwasm-compare-images LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 if(EMSCRIPTEN)
   set(io_components
diff --git a/packages/compress-stringify/CMakeLists.txt b/packages/compress-stringify/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 project(compress-stringify)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/BuildZstd.cmake)
 
diff --git a/packages/core/typescript/itk-wasm/test/pipelines/bindgen-interface-types-pipeline/CMakeLists.txt b/packages/core/typescript/itk-wasm/test/pipelines/bindgen-interface-types-pipeline/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
 project(bindgen-interface-types-test)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 set(io_components)
 if(NOT EMSCRIPTEN)
diff --git a/packages/core/typescript/itk-wasm/test/pipelines/input-output-files-pipeline/CMakeLists.txt b/packages/core/typescript/itk-wasm/test/pipelines/input-output-files-pipeline/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 project(input-output-files-test)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 find_package(ITK REQUIRED
   COMPONENTS WebAssemblyInterface)
diff --git a/packages/core/typescript/itk-wasm/test/pipelines/input-output-json-pipeline/CMakeLists.txt b/packages/core/typescript/itk-wasm/test/pipelines/input-output-json-pipeline/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 project(input-output-json-test)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 find_package(ITK REQUIRED
   COMPONENTS WebAssemblyInterface)
diff --git a/packages/core/typescript/itk-wasm/test/pipelines/median-filter-pipeline/CMakeLists.txt b/packages/core/typescript/itk-wasm/test/pipelines/median-filter-pipeline/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
 project(median-filter-test)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 set(io_components
   ITKImageIO
diff --git a/packages/core/typescript/itk-wasm/test/pipelines/mesh-read-write-pipeline/CMakeLists.txt b/packages/core/typescript/itk-wasm/test/pipelines/mesh-read-write-pipeline/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
 project(mesh-read-write-test)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 set(io_components)
 if(NOT EMSCRIPTEN)
diff --git a/packages/core/typescript/itk-wasm/test/pipelines/read-image/CMakeLists.txt b/packages/core/typescript/itk-wasm/test/pipelines/read-image/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
 project(read-image)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 find_package(ITK REQUIRED
   COMPONENTS WebAssemblyInterface
diff --git a/packages/dicom/CMakeLists.txt b/packages/dicom/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 project(itkwasm-dicom)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 enable_testing()
 
diff --git a/packages/downsample/CMakeLists.txt b/packages/downsample/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 project(itkwasm-downsample LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 if(EMSCRIPTEN)
   set(io_components
diff --git a/packages/image-io/CMakeLists.txt b/packages/image-io/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 project(itkwasm-image-io)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 if (NOT TARGET libzstd_static)
   include(${CMAKE_CURRENT_SOURCE_DIR}/BuildZstd.cmake)
diff --git a/packages/mesh-io/CMakeLists.txt b/packages/mesh-io/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 project(itkwasm-mesh-io)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 if (NOT TARGET libzstd_static)
   include(${CMAKE_CURRENT_SOURCE_DIR}/BuildZstd.cmake)
diff --git a/src/docker/itk-wasm-base/Dockerfile b/src/docker/itk-wasm-base/Dockerfile
@@ -65,7 +65,7 @@ RUN mkdir ITK-build && \
   cmake \
     -G Ninja \
     -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} \
-    -DCMAKE_CXX_STANDARD:STRING=17 \
+    -DCMAKE_CXX_STANDARD:STRING=20 \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DCMAKE_BUILD_TYPE:STRING=$CMAKE_BUILD_TYPE \
     -DBUILD_EXAMPLES:BOOL=OFF \
@@ -108,7 +108,7 @@ RUN git clone https://github.com/InsightSoftwareConsortium/ITKMeshToPolyData.git
   cmake \
     -G Ninja \
     -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} \
-    -DCMAKE_CXX_STANDARD:STRING=17 \
+    -DCMAKE_CXX_STANDARD:STRING=20 \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DCMAKE_BUILD_TYPE:STRING=$CMAKE_BUILD_TYPE \
     -DBUILD_TESTING:BOOL=OFF \
diff --git a/src/docker/itk-wasm/ITKWebAssemblyInterface.cmake b/src/docker/itk-wasm/ITKWebAssemblyInterface.cmake
@@ -1,7 +1,8 @@
 # Override the default set in the Emscripten toolchain (11) to be compatible
-# with ITK's requirement for c++14 or newer.
+# with ITK's requirement for C++17 or newer.
 # C++17 for string_view support
-set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT 17)
+# C++20 for glaze support
+set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT 20)
 
 if(NOT _ITKWebAssemblyInterface_INCLUDED)
 
