From c102ea556cfff121724f5e5d633121f6472d7720 Mon Sep 17 00:00:00 2001 From: Sujin Philip Date: Fri, 10 Apr 2020 11:04:04 -0500 Subject: [PATCH] Update cmake minimum required version to 3.12 --- .gitlab-ci.yml | 12 ++++++------ .gitlab/ci/ctest_build.cmake | 2 -- .gitlab/ci/ctest_configure.cmake | 2 -- .gitlab/ci/docker/rhel8/cuda10.2/Dockerfile | 8 ++++---- .gitlab/ci/docker/ubuntu1604/base/Dockerfile | 6 +++--- CMake/VTKmCheckCopyright.cmake | 1 - CMake/VTKmDeviceAdapters.cmake | 1 - CMakeLists.txt | 4 ++-- examples/clipping/CMakeLists.txt | 2 +- examples/contour_tree/CMakeLists.txt | 2 +- examples/contour_tree_augmented/CMakeLists.txt | 2 +- examples/cosmotools/CMakeLists.txt | 2 +- examples/demo/CMakeLists.txt | 2 +- examples/game_of_life/CMakeLists.txt | 2 +- examples/hello_worklet/CMakeLists.txt | 2 +- examples/histogram/CMakeLists.txt | 2 +- examples/lagrangian/CMakeLists.txt | 2 +- examples/lagrangian_structures/CMakeLists.txt | 2 +- examples/mesh_quality/CMakeLists.txt | 2 +- examples/multi_backend/CMakeLists.txt | 2 +- examples/oscillator/CMakeLists.txt | 2 +- examples/particle_advection/CMakeLists.txt | 2 +- examples/polyline_archimedean_helix/CMakeLists.txt | 2 +- examples/redistribute_points/CMakeLists.txt | 2 +- examples/temporal_advection/CMakeLists.txt | 2 +- examples/tetrahedra/CMakeLists.txt | 2 +- 26 files changed, 33 insertions(+), 39 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79c5f8940..2be9aae5d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,32 +40,32 @@ GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci .centos7: ¢os7 - image: "kitware/vtkm:ci-centos7_cuda10.2-20200320" + image: "kitware/vtkm:ci-centos7_cuda10.2-20200410" extends: - .docker_image .rhel8: &rhel8 - image: "kitware/vtkm:ci-rhel8_cuda10.2-20200320" + image: "kitware/vtkm:ci-rhel8_cuda10.2-20200410" extends: - .docker_image .ubuntu1604: &ubuntu1604 - image: "kitware/vtkm:ci-ubuntu1604-20200320" + image: "kitware/vtkm:ci-ubuntu1604-20200410" extends: - .docker_image .ubuntu1604_cuda: &ubuntu1604_cuda - image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200320" + image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200410" extends: - .docker_image .ubuntu1804: &ubuntu1804 - image: "kitware/vtkm:ci-ubuntu1804-20200330" + image: "kitware/vtkm:ci-ubuntu1804-20200410" extends: - .docker_image .ubuntu1804_cuda: &ubuntu1804_cuda - image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200320" + image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200410" extends: - .docker_image diff --git a/.gitlab/ci/ctest_build.cmake b/.gitlab/ci/ctest_build.cmake index 6a7f012be..3795d6d00 100644 --- a/.gitlab/ci/ctest_build.cmake +++ b/.gitlab/ci/ctest_build.cmake @@ -10,8 +10,6 @@ ## ##============================================================================= -cmake_minimum_required(VERSION 3.8) - # Read the files from the build directory that contain # host information ( name, parallel level, etc ) include("$ENV{CI_PROJECT_DIR}/build/CIState.cmake") diff --git a/.gitlab/ci/ctest_configure.cmake b/.gitlab/ci/ctest_configure.cmake index 0e0c9d999..e426ae0e6 100644 --- a/.gitlab/ci/ctest_configure.cmake +++ b/.gitlab/ci/ctest_configure.cmake @@ -10,8 +10,6 @@ ## ##============================================================================= -cmake_minimum_required(VERSION 3.8) - # Read the files from the build directory that contain # host information ( name, parallel level, etc ) include("$ENV{CI_PROJECT_DIR}/build/CIState.cmake") diff --git a/.gitlab/ci/docker/rhel8/cuda10.2/Dockerfile b/.gitlab/ci/docker/rhel8/cuda10.2/Dockerfile index 1feb22114..c0e6f547e 100644 --- a/.gitlab/ci/docker/rhel8/cuda10.2/Dockerfile +++ b/.gitlab/ci/docker/rhel8/cuda10.2/Dockerfile @@ -1,13 +1,10 @@ FROM nvidia/cuda:10.2-devel-ubi8 LABEL maintainer "Robert Maynard" -RUN yum install cmake make gcc gcc-c++ curl -y +RUN yum install make gcc gcc-c++ curl -y RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash RUN yum install git git-lfs -y -# Provide a consistent CMake path across all images -RUN mkdir -p /opt/cmake/bin && ln -s /usr/bin/cmake /opt/cmake/bin/cmake - # Provide CMake 3.17 so we can re-run tests easily # This will be used when we run just the tests RUN mkdir /opt/cmake-latest/ && \ @@ -15,4 +12,7 @@ RUN mkdir /opt/cmake-latest/ && \ sh cmake-3.17.0-Linux-x86_64.sh --prefix=/opt/cmake-latest/ --exclude-subdir --skip-license && \ ln -s /opt/cmake-latest/bin/ctest /opt/cmake-latest/bin/ctest-latest +# Provide a consistent CMake path across all images. Just use the lastest cmake +RUN mkdir -p /opt/cmake/bin && ln -s /opt/cmake-latest/bin/cmake /opt/cmake/bin/cmake + ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}" diff --git a/.gitlab/ci/docker/ubuntu1604/base/Dockerfile b/.gitlab/ci/docker/ubuntu1604/base/Dockerfile index a804dea65..8c933d947 100644 --- a/.gitlab/ci/docker/ubuntu1604/base/Dockerfile +++ b/.gitlab/ci/docker/ubuntu1604/base/Dockerfile @@ -36,10 +36,10 @@ RUN mkdir /opt/openmpi && \ make install # Provide a consistent CMake path across all images -# Install CMake 3.8 as it is the minium for non-cuda builds +# Install CMake 3.12 as it is the minium for non-cuda builds RUN mkdir /opt/cmake && \ - curl -L https://github.com/Kitware/CMake/releases/download/v3.8.2/cmake-3.8.2-Linux-x86_64.sh > cmake-3.8.2-Linux-x86_64.sh && \ - sh cmake-3.8.2-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license + curl -L https://github.com/Kitware/CMake/releases/download/v3.12.4/cmake-3.12.4-Linux-x86_64.sh > cmake-3.12.4-Linux-x86_64.sh && \ + sh cmake-3.12.4-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license # Provide CMake 3.17 so we can re-run tests easily # This will be used when we run just the tests diff --git a/CMake/VTKmCheckCopyright.cmake b/CMake/VTKmCheckCopyright.cmake index d89a9399d..6ef9d6c6c 100644 --- a/CMake/VTKmCheckCopyright.cmake +++ b/CMake/VTKmCheckCopyright.cmake @@ -15,7 +15,6 @@ ## cmake -DVTKm_SOURCE_DIR= -P /CMake/VTKMCheckCopyright.cmake ## -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) set(FILES_TO_CHECK *.txt *.cmake diff --git a/CMake/VTKmDeviceAdapters.cmake b/CMake/VTKmDeviceAdapters.cmake index ff0b25818..ea1425cf9 100644 --- a/CMake/VTKmDeviceAdapters.cmake +++ b/CMake/VTKmDeviceAdapters.cmake @@ -86,7 +86,6 @@ endif() if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp) - cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET) add_library(vtkm::openmp INTERFACE IMPORTED GLOBAL) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec2d1be10..eabc38856 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,11 +11,11 @@ # If you want CUDA support, you will need to have CMake 3.9 on Linux/OSX. # We require CMake 3.11 with the MSVC generator as the $ # generator expression is not supported on older versions. -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project (VTKm) if(${CMAKE_GENERATOR} MATCHES "Visual Studio") - cmake_minimum_required(VERSION 3.11...3.15 FATAL_ERROR) + cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) endif() # Update module path diff --git a/examples/clipping/CMakeLists.txt b/examples/clipping/CMakeLists.txt index f636c3ff4..6f26353ce 100644 --- a/examples/clipping/CMakeLists.txt +++ b/examples/clipping/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(Clipping CXX) #Find the VTK-m package diff --git a/examples/contour_tree/CMakeLists.txt b/examples/contour_tree/CMakeLists.txt index d8b7421f9..d8bfac343 100644 --- a/examples/contour_tree/CMakeLists.txt +++ b/examples/contour_tree/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(ContourTree CXX) #Find the VTK-m package diff --git a/examples/contour_tree_augmented/CMakeLists.txt b/examples/contour_tree_augmented/CMakeLists.txt index 797f4b0fa..8e94647f0 100644 --- a/examples/contour_tree_augmented/CMakeLists.txt +++ b/examples/contour_tree_augmented/CMakeLists.txt @@ -50,7 +50,7 @@ ## Hamish Carr (University of Leeds), Gunther H. Weber (LBNL), and ## Oliver Ruebel (LBNL) ##============================================================================== -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) # Find the VTK-m package find_package(VTKm REQUIRED QUIET) diff --git a/examples/cosmotools/CMakeLists.txt b/examples/cosmotools/CMakeLists.txt index 73affd2f4..1ac62ef8c 100644 --- a/examples/cosmotools/CMakeLists.txt +++ b/examples/cosmotools/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(CosmoTools CXX) #Find the VTK-m package diff --git a/examples/demo/CMakeLists.txt b/examples/demo/CMakeLists.txt index 6e2da170b..4495e56b4 100644 --- a/examples/demo/CMakeLists.txt +++ b/examples/demo/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(VTKmDemo CXX) #Find the VTK-m package diff --git a/examples/game_of_life/CMakeLists.txt b/examples/game_of_life/CMakeLists.txt index 12700f451..c15a41642 100644 --- a/examples/game_of_life/CMakeLists.txt +++ b/examples/game_of_life/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(GameOfLife CXX) #Find the VTK-m package diff --git a/examples/hello_worklet/CMakeLists.txt b/examples/hello_worklet/CMakeLists.txt index a91efabb9..806f69b57 100644 --- a/examples/hello_worklet/CMakeLists.txt +++ b/examples/hello_worklet/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.9...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(HelloWorklet CXX) #Find the VTK-m package diff --git a/examples/histogram/CMakeLists.txt b/examples/histogram/CMakeLists.txt index 40234f0dd..89440647e 100644 --- a/examples/histogram/CMakeLists.txt +++ b/examples/histogram/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(Histogram CXX) #Find the VTK-m package diff --git a/examples/lagrangian/CMakeLists.txt b/examples/lagrangian/CMakeLists.txt index 13abdcb16..c87652ea4 100644 --- a/examples/lagrangian/CMakeLists.txt +++ b/examples/lagrangian/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) #Find the VTK-m package find_package(VTKm REQUIRED QUIET) diff --git a/examples/lagrangian_structures/CMakeLists.txt b/examples/lagrangian_structures/CMakeLists.txt index 989158196..a64aa0187 100644 --- a/examples/lagrangian_structures/CMakeLists.txt +++ b/examples/lagrangian_structures/CMakeLists.txt @@ -9,7 +9,7 @@ ## PURPOSE. See the above copyright notice for more information. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(ParticleAdvection CXX) #Find the VTK-m package diff --git a/examples/mesh_quality/CMakeLists.txt b/examples/mesh_quality/CMakeLists.txt index 495756830..3987f3da2 100644 --- a/examples/mesh_quality/CMakeLists.txt +++ b/examples/mesh_quality/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(MeshQuality CXX) #Find the VTK-m package diff --git a/examples/multi_backend/CMakeLists.txt b/examples/multi_backend/CMakeLists.txt index 47a86bf21..2a05508a5 100644 --- a/examples/multi_backend/CMakeLists.txt +++ b/examples/multi_backend/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(MultiBackend CXX) #Find the VTK-m package diff --git a/examples/oscillator/CMakeLists.txt b/examples/oscillator/CMakeLists.txt index 9224b7f10..33aeeac03 100644 --- a/examples/oscillator/CMakeLists.txt +++ b/examples/oscillator/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(Oscillator CXX) #Find the VTK-m package diff --git a/examples/particle_advection/CMakeLists.txt b/examples/particle_advection/CMakeLists.txt index fd4bf4121..5c0b9a006 100644 --- a/examples/particle_advection/CMakeLists.txt +++ b/examples/particle_advection/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(ParticleAdvection CXX) #Find the VTK-m package diff --git a/examples/polyline_archimedean_helix/CMakeLists.txt b/examples/polyline_archimedean_helix/CMakeLists.txt index c57cf6023..deec524fa 100644 --- a/examples/polyline_archimedean_helix/CMakeLists.txt +++ b/examples/polyline_archimedean_helix/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(PolyLineArchimedeanHelix CXX) find_package(VTKm REQUIRED QUIET) diff --git a/examples/redistribute_points/CMakeLists.txt b/examples/redistribute_points/CMakeLists.txt index 2d12e05fa..8a2ff67e9 100644 --- a/examples/redistribute_points/CMakeLists.txt +++ b/examples/redistribute_points/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(RedistributePoints CXX) #Find the VTK-m package diff --git a/examples/temporal_advection/CMakeLists.txt b/examples/temporal_advection/CMakeLists.txt index dd3fc4447..027a24f7a 100644 --- a/examples/temporal_advection/CMakeLists.txt +++ b/examples/temporal_advection/CMakeLists.txt @@ -9,7 +9,7 @@ ##============================================================================ #Find the VTK-m package -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(TemporalAdvection CXX) #Find the VTK-m package diff --git a/examples/tetrahedra/CMakeLists.txt b/examples/tetrahedra/CMakeLists.txt index 0ed4ca011..c894daee5 100644 --- a/examples/tetrahedra/CMakeLists.txt +++ b/examples/tetrahedra/CMakeLists.txt @@ -7,7 +7,7 @@ ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## PURPOSE. See the above copyright notice for more information. ##============================================================================ -cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.15 FATAL_ERROR) project(Tetrahedra CXX) #Find the VTK-m package