From a9717f92903aea4f8c9692d6c71306608c9e5194 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Wed, 26 Mar 2025 08:10:31 +0100
Subject: [PATCH 1/2] smtk: use C++17

---
 projects/smtk.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/smtk.cmake b/projects/smtk.cmake
index 809ba734..c0f1492d 100644
--- a/projects/smtk.cmake
+++ b/projects/smtk.cmake
@@ -63,7 +63,7 @@ superbuild_add_project(smtk
   DEBUGGABLE
   DEFAULT_ON
   ${smtk_step_keyword} ${smtk_lfs_steps} download update
-  DEPENDS boost cxx11 eigen hdf5 libarchive moab netcdf nlohmannjson pegtl units fmt
+  DEPENDS boost cxx17 eigen hdf5 libarchive moab netcdf nlohmannjson pegtl units fmt
   DEPENDS_OPTIONAL gdal netcdf occt paraview pybind11
                    python3 matplotlib qt5 vtkonly
   CMAKE_ARGS
-- 
GitLab


From 366c9de9350003913957a4cf0b2bbb7d5d27c0d6 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Fri, 28 Mar 2025 09:11:55 +0100
Subject: [PATCH 2/2] gitlab-ci: update MSVC compiler

SMTK is getting ICEd, so try a newer compiler. Sync with what SMTK
itself uses.
---
 .gitlab/os-windows.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index 6b9e58f9..06cba193 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -33,7 +33,7 @@
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x64"
-        VCVARSVERSION: "14.32.31326"
+        VCVARSVERSION: "14.35.32215"
 
 .windows_vs2022_aeva:
     extends: .windows_vs2022
@@ -76,7 +76,7 @@
 .windows_builder_tags:
     tags:
         - cmb # Since this is a bare runner, pin to a project.
-        - msvc-19.32
+        - msvc-19.35
         - nonconcurrent
         - shell
         - vs2022
-- 
GitLab