Commit a12c6078 authored by Robert Maynard's avatar Robert Maynard
Browse files

ParaView and VTK-m don't depend on cxx11 to resolve cuda compile issues

The CXX11 project injects additional flags ('std=c++11') into the CXX compile
line. This is unnecessary as both projects already require C++11. Secondly
this breaks the CUDA compilation of VTK-m filters as now CUDA has two
occurrences of C++11 on the compile line and errors out.
parent 77e50195
......@@ -124,6 +124,13 @@ function (superbuild_sanity_check)
superbuild_qt_sanity_check()
# Sanity check: Cannot have paraview and have cxx11 disabled.
if (NOT cxx11_enabled AND paraview_enabled)
#While ParaView doesn't depend on cxx11 it needs to make sure that
#other projects that optionally depend on it are built with cxx11
message(SEND_ERROR "Cannot disable cxx11 when paraview is enabled.")
endif ()
# Sanity check: Cannot have EGL and Qt enabled at the same time.
if (egl_enabled AND qt5_enabled)
message(SEND_ERROR "Cannot enable EGL and Qt at the same time.")
......@@ -259,6 +266,9 @@ list(APPEND superbuild_project_roots
# set the default arguments used for "git clone"
set(_git_clone_arguments_default --progress)
# set the default for cxx11 to be enabled for this project
set(_superbuild_default_cxx11 ON)
if (NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/superbuild/CMakeLists.txt")
message(FATAL_ERROR "It appears as though the superbuild infrastructure "
"is missing; did you forget to do `git submodule init` "
......
......@@ -100,7 +100,7 @@ superbuild_add_project(paraview
DEBUGGABLE
DEFAULT_ON
DEPENDS_OPTIONAL
cxx11 boost hdf5 matplotlib mpi numpy png
boost hdf5 matplotlib mpi numpy png
python qt5 visitbridge zlib silo
xdmf3 ospray vrpn vtkm tbb netcdf
paraviewusersguide paraviewgettingstartedguide
......
superbuild_add_project(vtkm
DEFAULT_ON
DEPENDS tbb cxx11
DEPENDS tbb
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DVTKm_ENABLE_TBB:BOOL=${tbb_enabled}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment