diff --git a/CMake/VTKmCheckCopyright.cmake b/CMake/VTKmCheckCopyright.cmake index 073d15b2d..c84359b2f 100644 --- a/CMake/VTKmCheckCopyright.cmake +++ b/CMake/VTKmCheckCopyright.cmake @@ -15,7 +15,7 @@ ## cmake -DVTKm_SOURCE_DIR= -P /CMake/VTKMCheckCopyright.cmake ## -cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) set(FILES_TO_CHECK *.txt *.cmake diff --git a/CMake/VTKmCompilerFlags.cmake b/CMake/VTKmCompilerFlags.cmake index bc4e7948d..257646b96 100644 --- a/CMake/VTKmCompilerFlags.cmake +++ b/CMake/VTKmCompilerFlags.cmake @@ -73,10 +73,17 @@ if(VTKM_COMPILER_IS_MSVC) target_compile_definitions(vtkm_developer_flags INTERFACE "_SCL_SECURE_NO_WARNINGS" "_CRT_SECURE_NO_WARNINGS") + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.15) + set(cxx_flags "-W3") + set(cuda_flags "-Xcompiler=-W3") + endif() + list(APPEND cxx_flags -wd4702 -wd4505) + list(APPEND cuda_flags "-Xcompiler=-wd4702,-wd4505") + #Setup MSVC warnings with CUDA and CXX - target_compile_options(vtkm_developer_flags INTERFACE $<$:-wd4702 -wd4505>) + target_compile_options(vtkm_developer_flags INTERFACE $<$:${cxx_flags}>) if(TARGET vtkm::cuda) - target_compile_options(vtkm_developer_flags INTERFACE $<$:-Xcompiler=-wd4702,-wd4505 -Xcudafe=--diag_suppress=1394,--diag_suppress=766>) + target_compile_options(vtkm_developer_flags INTERFACE $<$:${cuda_flags} -Xcudafe=--diag_suppress=1394,--diag_suppress=766>) endif() if(MSVC_VERSION LESS 1900) diff --git a/CMake/VTKmDeviceAdapters.cmake b/CMake/VTKmDeviceAdapters.cmake index 775a6f7e3..8d3d795ee 100644 --- a/CMake/VTKmDeviceAdapters.cmake +++ b/CMake/VTKmDeviceAdapters.cmake @@ -86,7 +86,7 @@ endif() if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp) - cmake_minimum_required(VERSION 3.9...3.14 FATAL_ERROR) + cmake_minimum_required(VERSION 3.9...3.15 FATAL_ERROR) find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET) add_library(vtkm::openmp INTERFACE IMPORTED GLOBAL) @@ -107,7 +107,7 @@ if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp) endif() if(VTKm_ENABLE_CUDA) - cmake_minimum_required(VERSION 3.13...3.14 FATAL_ERROR) + cmake_minimum_required(VERSION 3.13...3.15 FATAL_ERROR) enable_language(CUDA) if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA" AND diff --git a/CMakeLists.txt b/CMakeLists.txt index 872eba880..fe3f3f476 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) project (VTKm) if(${CMAKE_GENERATOR} MATCHES "Visual Studio") - cmake_minimum_required(VERSION 3.11...3.14 FATAL_ERROR) + cmake_minimum_required(VERSION 3.11...3.15 FATAL_ERROR) endif() # Update module path diff --git a/examples/clipping/CMakeLists.txt b/examples/clipping/CMakeLists.txt index be7c72315..7b1a83294 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 172719963..2b30448a5 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) project(ContourTree CXX) #Find the VTK-m package diff --git a/examples/cosmotools/CMakeLists.txt b/examples/cosmotools/CMakeLists.txt index f47d77b0c..120a6da45 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 1d64afb0d..af3139ae1 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 3bbab95c9..57901709b 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 fdc63c893..36d99fbc1 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.9...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 3b9f17cf0..ee8776092 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 ba0e2e75d..1060a31e8 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 93d8351ea..84adb5889 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 7bd7a3f16..38c3229a0 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 11edc475a..7e54382a9 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 a51676a94..955fbade7 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 739d67b98..0b32bd79b 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 22efa87c9..8f0bc5ac0 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 42f1a4564..f53189d7d 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 5fdb43594..39ad2c6a6 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...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 6b5bbb781..dc2771a5b 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.14 FATAL_ERROR) +cmake_minimum_required(VERSION 3.8...3.15 FATAL_ERROR) project(Tetrahedra CXX) #Find the VTK-m package