From f60a45bc639396e76b4a08371b512c7ec7334a15 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Mon, 12 Apr 2021 13:29:46 -0400 Subject: [PATCH] Enforce C++14 in the whole project Signed-off-by: Vicente Adolfo Bolea Sanchez --- CMake/VTKmCompilerFlags.cmake | 4 ++-- vtkm/thirdparty/diy/update.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMake/VTKmCompilerFlags.cmake b/CMake/VTKmCompilerFlags.cmake index 0ed12be3e..2a4aaa545 100644 --- a/CMake/VTKmCompilerFlags.cmake +++ b/CMake/VTKmCompilerFlags.cmake @@ -40,8 +40,8 @@ add_library(vtkm_compiler_flags INTERFACE) target_link_libraries(vtkm_compiler_flags INTERFACE $) -# setup that we need C++11 support -target_compile_features(vtkm_compiler_flags INTERFACE cxx_std_11) +# setup that we need C++14 support +target_compile_features(vtkm_compiler_flags INTERFACE cxx_std_14) # setup our static libraries so that a separate ELF section # is generated for each function. This allows for the linker to diff --git a/vtkm/thirdparty/diy/update.sh b/vtkm/thirdparty/diy/update.sh index 1ee37c531..1be1c2e35 100755 --- a/vtkm/thirdparty/diy/update.sh +++ b/vtkm/thirdparty/diy/update.sh @@ -8,7 +8,7 @@ readonly name="diy" readonly ownership="Diy Upstream " readonly subtree="vtkm/thirdparty/$name/vtkm$name" readonly repo="https://gitlab.kitware.com/third-party/diy2.git" -readonly tag="for/vtk-m-20201026-master" +readonly tag="for/vtk-m-20210412-master" readonly paths=" cmake include