diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bad5564337367aba0b659ef46456cf37d705571e..380c83ddc0c6142193ccb7521c3e9bf0099a917e 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 7cfc5a52926d039dbbd021b01c10c814c7f885f6..07d4ac83742e894697086689a8a17bd37a99b3e3 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" diff --git a/CMakeLists.txt b/CMakeLists.txt index 46d1cfc37cb4b529451340f1bc0128e9f2c15e5f..cfa85247d23d25537031a28a845b317979bc09a9 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 9b794aeac5089e6da415a139aa3b36f1260d5c22..3aff451a8e63d022bd081d635921535caf54aa3b 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: diff --git a/vtkm/thirdparty/diy/update.sh b/vtkm/thirdparty/diy/update.sh index a6fdcf8b3d48bed84ac65908ec34102a4da16dfc..97cc5ad57f0b62de157b81d795d3b230b04db4a8 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 diff --git a/vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt b/vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt index 344398ea9dc8b6d5253e27de08e44e588279943b..748372e5ba322591332e5fe2e84303ea8e6921c4 100644 --- a/vtkm/thirdparty/diy/vtkmdiy/CMakeLists.txt +++ b/vtkm/thirdparty/diy/vtkmdiy/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)