Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-08 03:18:58 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Opt into all CMake 3.15 policies

Browse Source
This commit is contained in:
Robert Maynard 2019-08-20 10:36:53 -04:00
parent 7c25929dae
commit 267f963d32
21 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/VTKmCheckCopyright.cmake
View File

@ -15,7 +15,7 @@
## cmake -DVTKm_SOURCE_DIR=<VTKm_SOURCE_DIR> -P <VTKm_SOURCE_DIR>/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

11
CMake/VTKmCompilerFlags.cmake
View File

@ -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 $<$<COMPILE_LANGUAGE:CXX>:-wd4702 -wd4505>)
target_compile_options(vtkm_developer_flags INTERFACE $<$<COMPILE_LANGUAGE:CXX>:${cxx_flags}>)
if(TARGET vtkm::cuda)
target_compile_options(vtkm_developer_flags INTERFACE $<$<COMPILE_LANGUAGE:CUDA>:-Xcompiler=-wd4702,-wd4505 -Xcudafe=--diag_suppress=1394,--diag_suppress=766>)
target_compile_options(vtkm_developer_flags INTERFACE $<$<COMPILE_LANGUAGE:CUDA>:${cuda_flags} -Xcudafe=--diag_suppress=1394,--diag_suppress=766>)
endif()
if(MSVC_VERSION LESS 1900)

4
CMake/VTKmDeviceAdapters.cmake
View File

@ -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

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.
# We require CMake 3.11 with the MSVC generator as the $<COMPILE_LANGUAGE:>
# 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

2
examples/clipping/CMakeLists.txt
View File

@ -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

2
examples/contour_tree/CMakeLists.txt
View File

@ -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

2
examples/cosmotools/CMakeLists.txt
View File

@ -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

2
examples/demo/CMakeLists.txt
View File

@ -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

2
examples/game_of_life/CMakeLists.txt
View File

@ -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

2
examples/hello_worklet/CMakeLists.txt
View File

@ -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

2
examples/histogram/CMakeLists.txt
View File

@ -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

2
examples/lagrangian/CMakeLists.txt
View File

@ -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)

2
examples/lagrangian_structures/CMakeLists.txt
View File

@ -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

2
examples/mesh_quality/CMakeLists.txt
View File

@ -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

2
examples/multi_backend/CMakeLists.txt
View File

@ -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

2
examples/oscillator/CMakeLists.txt
View File

@ -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

2
examples/particle_advection/CMakeLists.txt
View File

@ -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

2
examples/polyline_archimedean_helix/CMakeLists.txt
View File

@ -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)

2
examples/redistribute_points/CMakeLists.txt
View File

@ -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

2
examples/temporal_advection/CMakeLists.txt
View File

@ -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

2
examples/tetrahedra/CMakeLists.txt
View File

@ -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