diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 6b9e58f9eab289b1a8ae8aa10a35253f2ae81dbb..06cba193dd97e0ee6e67f1bc90909403a3421065 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 diff --git a/projects/smtk.cmake b/projects/smtk.cmake index 809ba73463c47d4634cd864280048565f1f9ddd7..c0f1492df1c4d09f1c36d6927bee2ae49bb84989 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