Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'update-cmake-version'

Browse Source 
c102ea556 Update cmake minimum required version to 3.12

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2037
This commit is contained in:
Sujin Philip 2020-04-14 13:41:25 +00:00 committed by Kitware Robot
commit c59a203b97
26 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -40,32 +40,32 @@
GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci
.centos7: &centos7 .centos7: &centos7
image: "kitware/vtkm:ci-centos7_cuda10.2-20200320" image: "kitware/vtkm:ci-centos7_cuda10.2-20200410"
extends: extends:
- .docker_image - .docker_image
.rhel8: &rhel8 .rhel8: &rhel8
image: "kitware/vtkm:ci-rhel8_cuda10.2-20200320" image: "kitware/vtkm:ci-rhel8_cuda10.2-20200410"
extends: extends:
- .docker_image - .docker_image
.ubuntu1604: &ubuntu1604 .ubuntu1604: &ubuntu1604
image: "kitware/vtkm:ci-ubuntu1604-20200320" image: "kitware/vtkm:ci-ubuntu1604-20200410"
extends: extends:
- .docker_image - .docker_image
.ubuntu1604_cuda: &ubuntu1604_cuda .ubuntu1604_cuda: &ubuntu1604_cuda
image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200320" image: "kitware/vtkm:ci-ubuntu1604_cuda9.2-20200410"
extends: extends:
- .docker_image - .docker_image
.ubuntu1804: &ubuntu1804 .ubuntu1804: &ubuntu1804
image: "kitware/vtkm:ci-ubuntu1804-20200330" image: "kitware/vtkm:ci-ubuntu1804-20200410"
extends: extends:
- .docker_image - .docker_image
.ubuntu1804_cuda: &ubuntu1804_cuda .ubuntu1804_cuda: &ubuntu1804_cuda
image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200320" image: "kitware/vtkm:ci-ubuntu1804_cuda10.1-20200410"
extends: extends:
- .docker_image - .docker_image

2
.gitlab/ci/ctest_build.cmake
View File

@ -10,8 +10,6 @@
## ##
##============================================================================= ##=============================================================================
cmake_minimum_required(VERSION 3.8)
# Read the files from the build directory that contain # Read the files from the build directory that contain
# host information ( name, parallel level, etc ) # host information ( name, parallel level, etc )
include("$ENV{CI_PROJECT_DIR}/build/CIState.cmake") include("$ENV{CI_PROJECT_DIR}/build/CIState.cmake")

2
.gitlab/ci/ctest_configure.cmake
View File

@ -10,8 +10,6 @@
## ##
##============================================================================= ##=============================================================================
cmake_minimum_required(VERSION 3.8)
# Read the files from the build directory that contain # Read the files from the build directory that contain
# host information ( name, parallel level, etc ) # host information ( name, parallel level, etc )
include("$ENV{CI_PROJECT_DIR}/build/CIState.cmake") include("$ENV{CI_PROJECT_DIR}/build/CIState.cmake")

8
.gitlab/ci/docker/rhel8/cuda10.2/Dockerfile
View File

@ -1,13 +1,10 @@
FROM nvidia/cuda:10.2-devel-ubi8 FROM nvidia/cuda:10.2-devel-ubi8
LABEL maintainer "Robert Maynard<robert.maynard@kitware.com>" LABEL maintainer "Robert Maynard<robert.maynard@kitware.com>"
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 curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash
RUN yum install git git-lfs -y 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 # Provide CMake 3.17 so we can re-run tests easily
# This will be used when we run just the tests # This will be used when we run just the tests
RUN mkdir /opt/cmake-latest/ && \ 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 && \ 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 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}" ENV PATH "/opt/cmake/bin:/opt/cmake-latest/bin:${PATH}"

6
.gitlab/ci/docker/ubuntu1604/base/Dockerfile
View File

@ -36,10 +36,10 @@ RUN mkdir /opt/openmpi && \
make install make install
# Provide a consistent CMake path across all images # 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 && \ 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 && \ 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.8.2-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license 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 # Provide CMake 3.17 so we can re-run tests easily
# This will be used when we run just the tests # This will be used when we run just the tests

1
CMake/VTKmCheckCopyright.cmake
View File

@ -15,7 +15,6 @@
## cmake -DVTKm_SOURCE_DIR=<VTKm_SOURCE_DIR> -P <VTKm_SOURCE_DIR>/CMake/VTKMCheckCopyright.cmake ## cmake -DVTKm_SOURCE_DIR=<VTKm_SOURCE_DIR> -P <VTKm_SOURCE_DIR>/CMake/VTKMCheckCopyright.cmake
## ##
cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR)
set(FILES_TO_CHECK set(FILES_TO_CHECK
*.txt *.txt
*.cmake *.cmake

1
CMake/VTKmDeviceAdapters.cmake
View File

@ -86,7 +86,6 @@ endif()
if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp) 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) find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET)
add_library(vtkm::openmp INTERFACE IMPORTED GLOBAL) add_library(vtkm::openmp INTERFACE IMPORTED GLOBAL)

4
CMakeLists.txt
View File

@ -11,11 +11,11 @@
# If you want CUDA support, you will need to have CMake 3.9 on Linux/OSX. # 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 $<COMPILE_LANGUAGE:> # We require CMake 3.11 with the MSVC generator as the $<COMPILE_LANGUAGE:>
# generator expression is not supported on older versions. # 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) project (VTKm)
if(${CMAKE_GENERATOR} MATCHES "Visual Studio") 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() endif()
# Update module path # Update module path

2
examples/clipping/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(Clipping CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/contour_tree/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(ContourTree CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/contour_tree_augmented/CMakeLists.txt
View File

@ -50,7 +50,7 @@
## Hamish Carr (University of Leeds), Gunther H. Weber (LBNL), and ## Hamish Carr (University of Leeds), Gunther H. Weber (LBNL), and
## Oliver Ruebel (LBNL) ## 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 the VTK-m package
find_package(VTKm REQUIRED QUIET) find_package(VTKm REQUIRED QUIET)

2
examples/cosmotools/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(CosmoTools CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/demo/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(VTKmDemo CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/game_of_life/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(GameOfLife CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/hello_worklet/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(HelloWorklet CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/histogram/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(Histogram CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/lagrangian/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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 the VTK-m package
find_package(VTKm REQUIRED QUIET) find_package(VTKm REQUIRED QUIET)

2
examples/lagrangian_structures/CMakeLists.txt
View File

@ -9,7 +9,7 @@
## PURPOSE. See the above copyright notice for more information. ## 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) project(ParticleAdvection CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/mesh_quality/CMakeLists.txt
View File

@ -19,7 +19,7 @@
## this software. ## 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) project(MeshQuality CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/multi_backend/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(MultiBackend CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/oscillator/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(Oscillator CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/particle_advection/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(ParticleAdvection CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/polyline_archimedean_helix/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(PolyLineArchimedeanHelix CXX)
find_package(VTKm REQUIRED QUIET) find_package(VTKm REQUIRED QUIET)

2
examples/redistribute_points/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(RedistributePoints CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/temporal_advection/CMakeLists.txt
View File

@ -9,7 +9,7 @@
##============================================================================ ##============================================================================
#Find the VTK-m package #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) project(TemporalAdvection CXX)
#Find the VTK-m package #Find the VTK-m package

2
examples/tetrahedra/CMakeLists.txt
View File

@ -7,7 +7,7 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information. ## 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) project(Tetrahedra CXX)
#Find the VTK-m package #Find the VTK-m package