From 0ce7e82d4354b724951e64af9e9cc6db22480232 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 26 Mar 2019 11:50:06 -0400 Subject: [PATCH] VTK-m now enables all new CMake policies in 3.14 This means that we opt-in to policy changes introduced in 3.14 --- CMake/VTKmDeviceAdapters.cmake | 4 ++-- CMakeLists.txt | 4 ++-- examples/clipping/CMakeLists.txt | 2 +- examples/contour_tree/CMakeLists.txt | 2 +- examples/cosmotools/CMakeLists.txt | 2 +- examples/demo/CMakeLists.txt | 2 +- examples/game_of_life/CMakeLists.txt | 2 +- examples/hello_world/CMakeLists.txt | 2 +- examples/histogram/CMakeLists.txt | 2 +- examples/isosurface/CMakeLists.txt | 2 +- examples/multi_backend/CMakeLists.txt | 2 +- examples/oscillator/CMakeLists.txt | 2 +- examples/particle_advection/CMakeLists.txt | 2 +- examples/redistribute_points/CMakeLists.txt | 2 +- examples/rendering/CMakeLists.txt | 2 +- examples/streamline/CMakeLists.txt | 2 +- examples/tau_timing/CMakeLists.txt | 2 +- examples/temporal_advection/CMakeLists.txt | 2 +- examples/tetrahedra/CMakeLists.txt | 2 +- examples/unified_memory/CMakeLists.txt | 2 +- 20 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CMake/VTKmDeviceAdapters.cmake b/CMake/VTKmDeviceAdapters.cmake index 030a976f0..b80de3804 100644 --- a/CMake/VTKmDeviceAdapters.cmake +++ b/CMake/VTKmDeviceAdapters.cmake @@ -96,7 +96,7 @@ endif() if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp) - cmake_minimum_required(VERSION 3.9...3.13 FATAL_ERROR) + cmake_minimum_required(VERSION 3.9...3.14 FATAL_ERROR) find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET) add_library(vtkm::openmp INTERFACE IMPORTED GLOBAL) @@ -117,7 +117,7 @@ if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp) endif() if(VTKm_ENABLE_CUDA AND NOT TARGET vtkm::cuda) - cmake_minimum_required(VERSION 3.9...3.13 FATAL_ERROR) + cmake_minimum_required(VERSION 3.9...3.14 FATAL_ERROR) enable_language(CUDA) #To work around https://gitlab.kitware.com/cmake/cmake/issues/17512 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ea65759f..48c9247d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,11 +21,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.13) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project (VTKm) if(${CMAKE_GENERATOR} MATCHES "Visual Studio") - cmake_minimum_required(VERSION 3.11...3.13 FATAL_ERROR) + cmake_minimum_required(VERSION 3.11...3.14 FATAL_ERROR) endif() # Update module path diff --git a/examples/clipping/CMakeLists.txt b/examples/clipping/CMakeLists.txt index 1dda46f96..47b989e5c 100644 --- a/examples/clipping/CMakeLists.txt +++ b/examples/clipping/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 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 c300ee432..fdb420e26 100644 --- a/examples/contour_tree/CMakeLists.txt +++ b/examples/contour_tree/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(ContourTree CXX) #Find the VTK-m package diff --git a/examples/cosmotools/CMakeLists.txt b/examples/cosmotools/CMakeLists.txt index 619c46ce3..e64156898 100644 --- a/examples/cosmotools/CMakeLists.txt +++ b/examples/cosmotools/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(CosmoTools CXX) #Find the VTK-m package diff --git a/examples/demo/CMakeLists.txt b/examples/demo/CMakeLists.txt index 8079d06a1..fd737e976 100644 --- a/examples/demo/CMakeLists.txt +++ b/examples/demo/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 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 61221fabe..d78380da3 100644 --- a/examples/game_of_life/CMakeLists.txt +++ b/examples/game_of_life/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(GameOfLife CXX) #Find the VTK-m package diff --git a/examples/hello_world/CMakeLists.txt b/examples/hello_world/CMakeLists.txt index 920e381d1..c4308bb2e 100755 --- a/examples/hello_world/CMakeLists.txt +++ b/examples/hello_world/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(HelloWorld CXX) #Find the VTK-m package diff --git a/examples/histogram/CMakeLists.txt b/examples/histogram/CMakeLists.txt index 1b31af9d2..2500af13c 100644 --- a/examples/histogram/CMakeLists.txt +++ b/examples/histogram/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(Histogram CXX) #Find the VTK-m package diff --git a/examples/isosurface/CMakeLists.txt b/examples/isosurface/CMakeLists.txt index 98971d6ef..b62f693f6 100644 --- a/examples/isosurface/CMakeLists.txt +++ b/examples/isosurface/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(IsoSurface CXX) #Find the VTK-m package diff --git a/examples/multi_backend/CMakeLists.txt b/examples/multi_backend/CMakeLists.txt index b9b5f12ca..dfc122ad4 100644 --- a/examples/multi_backend/CMakeLists.txt +++ b/examples/multi_backend/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(MultiBackend CXX) #Find the VTK-m package diff --git a/examples/oscillator/CMakeLists.txt b/examples/oscillator/CMakeLists.txt index 1959a9058..f48f67f47 100644 --- a/examples/oscillator/CMakeLists.txt +++ b/examples/oscillator/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 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 f760a0df2..bc2eaf366 100644 --- a/examples/particle_advection/CMakeLists.txt +++ b/examples/particle_advection/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(ParticleAdvection CXX) #Find the VTK-m package diff --git a/examples/redistribute_points/CMakeLists.txt b/examples/redistribute_points/CMakeLists.txt index 0eea1ab5c..dd28e2256 100644 --- a/examples/redistribute_points/CMakeLists.txt +++ b/examples/redistribute_points/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(RedistributePoints CXX) #Find the VTK-m package diff --git a/examples/rendering/CMakeLists.txt b/examples/rendering/CMakeLists.txt index 0bf913cb2..0020c0623 100644 --- a/examples/rendering/CMakeLists.txt +++ b/examples/rendering/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(RenderingExample CXX) #Find the VTK-m package diff --git a/examples/streamline/CMakeLists.txt b/examples/streamline/CMakeLists.txt index edc058e33..7e954f7a3 100644 --- a/examples/streamline/CMakeLists.txt +++ b/examples/streamline/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(Streamline CXX) #Find the VTK-m package diff --git a/examples/tau_timing/CMakeLists.txt b/examples/tau_timing/CMakeLists.txt index 11c912539..f56eb037c 100644 --- a/examples/tau_timing/CMakeLists.txt +++ b/examples/tau_timing/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(TauTiming CXX) #Find the VTK-m package diff --git a/examples/temporal_advection/CMakeLists.txt b/examples/temporal_advection/CMakeLists.txt index 70c5a3c57..1f3efa9e4 100644 --- a/examples/temporal_advection/CMakeLists.txt +++ b/examples/temporal_advection/CMakeLists.txt @@ -21,7 +21,7 @@ ##============================================================================= #Find the VTK-m package -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(TemporalAdvection CXX) #Find the VTK-m package diff --git a/examples/tetrahedra/CMakeLists.txt b/examples/tetrahedra/CMakeLists.txt index 1160b1eb7..52e036a86 100644 --- a/examples/tetrahedra/CMakeLists.txt +++ b/examples/tetrahedra/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(Tetrahedra CXX) #Find the VTK-m package diff --git a/examples/unified_memory/CMakeLists.txt b/examples/unified_memory/CMakeLists.txt index 6f29d4af2..3aa14034a 100644 --- a/examples/unified_memory/CMakeLists.txt +++ b/examples/unified_memory/CMakeLists.txt @@ -19,7 +19,7 @@ ## this software. ## ##============================================================================= -cmake_minimum_required(VERSION 3.8...3.13 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) project(UnifiedMemory CXX) #Find the VTK-m package