From 617eb9adf05cd63e305b537dec297ba6a1420c64 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Mon, 17 Mar 2025 15:51:03 -0400 Subject: [PATCH 1/4] cmake: bump min cmake version to 3.15 --- CMakeLists.txt | 3 +-- README.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46d1cfc37c..cfa85247d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,7 @@ ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -# If you want CUDA support, you will need to have CMake 3.13 on Linux/OSX. -cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.15 FATAL_ERROR) project (VTKm) # We only allow c++14 diff --git a/README.md b/README.md index 9b794aeac5..3aff451a8e 100644 --- a/README.md +++ b/README.md @@ -74,8 +74,7 @@ VTK-m Requires: + MSVC 2015+ + Intel 17.0.4+ + [CMake](http://www.cmake.org/download/) - + CMake 3.12+ - + CMake 3.13+ (for CUDA support) + + CMake 3.15+ + CMake 3.24+ (for ROCM+THRUST support) Optional dependencies are: -- GitLab From 51a3ad8bdc295a67cab218cf2e7820ada1e830e7 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Mon, 17 Mar 2025 15:51:04 -0400 Subject: [PATCH 2/4] ci: bump min tested cmake ver to 3.15.5 --- .gitlab-ci.yml | 2 +- .gitlab/ci/config/cmake.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bad5564337..380c83ddc0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,7 +126,7 @@ stages: .use_minimum_supported_cmake: variables: - CMAKE_VERSION: "3.13.5" + CMAKE_VERSION: "3.15.5" .warning_policy: allow_failure: diff --git a/.gitlab/ci/config/cmake.sh b/.gitlab/ci/config/cmake.sh index 7cfc5a5292..07d4ac8374 100755 --- a/.gitlab/ci/config/cmake.sh +++ b/.gitlab/ci/config/cmake.sh @@ -21,7 +21,7 @@ case "$( uname -s )" in Linux) readonly -A sumsByVersion=( # We require CMake >= 3.13 in the CI to support CUDA builds - ['3.13.5']='e2fd0080a6f0fc1ec84647acdcd8e0b4019770f48d83509e6a5b0b6ea27e5864' + ['3.15.5']='03cfd669d0f990040ec89bb63a3ae7f6d61fd17c1c4d5e7ec3d1a35fe1f043f0' ['3.30.2']='cdd7fb352605cee3ae53b0e18b5929b642900e33d6b0173e19f6d4f2067ebf16' ) shatool="sha256sum" -- GitLab From cf5b3134f83465c36d3c9e0450cda9031bb36db2 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Sat, 15 Mar 2025 19:08:22 -0400 Subject: [PATCH 3/4] bump diy2 --- vtkm/thirdparty/diy/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtkm/thirdparty/diy/update.sh b/vtkm/thirdparty/diy/update.sh index a6fdcf8b3d..97cc5ad57f 100755 --- a/vtkm/thirdparty/diy/update.sh +++ b/vtkm/thirdparty/diy/update.sh @@ -8,7 +8,7 @@ readonly name="diy" readonly ownership="Diy Upstream " readonly subtree="vtkm/thirdparty/$name/vtkm$name" readonly repo="https://gitlab.kitware.com/third-party/diy2.git" -readonly tag="for/vtk-m-20230616-g40ea01f9" +readonly tag="for/vtk-m-20250321-g40ea01f9" readonly paths=" cmake include -- GitLab From 86f8b9ff3b78c56501c151528d55782eeac6432b Mon Sep 17 00:00:00 2001 From: Diy Upstream Date: Wed, 19 Mar 2025 21:50:20 -0400 Subject: [PATCH 4/4] diy 2025-03-19 (bd468e35) Code extracted from: https://gitlab.kitware.com/third-party/diy2.git at commit bd468e35508e0d1e1528e8030031f942778cbfed (for/vtk-m-20250321-g40ea01f9). --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 344398ea9d..748372e5ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ #============================================================================= project (DIY) -cmake_minimum_required (VERSION 3.9) +cmake_minimum_required (VERSION 3.15) list (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) -- GitLab