Commit 9b41b042 authored by Shawn Waldon's avatar Shawn Waldon
Browse files

vtkm: make this a dummy project when it is moved into VTK

VTK-m is becoming a submodule of VTK so will be built as a part of
ParaView when it is enabled.  The vtkm project in the superbuild is
now a dummy project that controls whether it is enabled in the ParaView
build.
parent 7dd5d9b7
superbuild_add_project(vtkm
DEFAULT_ON
DEPENDS tbb
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DVTKm_ENABLE_TBB:BOOL=${tbb_enabled}
-DVTKm_ENABLE_RENDERING:BOOL=OFF
-DVTKm_ENABLE_TESTING:BOOL=OFF
-DTBB_ROOT:PATH=<INSTALL_DIR>)
superbuild_add_extra_cmake_args(
-DVTKm_DIR:PATH=<INSTALL_DIR>/lib)
if (APPLE)
superbuild_append_flags(cxx_flags "-stdlib=libc++" PROJECT_ONLY)
superbuild_append_flags(ld_flags "-stdlib=libc++" PROJECT_ONLY)
endif ()
superbuild_add_dummy_project(vtkm)
......@@ -62,20 +62,6 @@ superbuild_set_revision(catalyst
${paraview_revision})
unset(paraview_revision)
superbuild_set_selectable_source(vtkm
SELECT for-5.4.0 DEFAULT
# keep this updated to the version needed to build the DEFAULT ParaView version.
URL https://www.paraview.org/files/dependencies/vtkm-a181373382cf9a3c1de2708756f55797ec065ab6.tar.bz2
URL_MD5 903966d713d895fd61a4c78278ba7079
SELECT for-git CUSTOMIZABLE
# keep this updated to the version needed to build ParaView "master".
GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk-m.git"
GIT_TAG "fce4ddc9669fd9eac6ad9848b3594a4e41af11dc"
SELECT git-master CUSTOMIZABLE
# this is simply vtk-m's "master".
GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk-m.git"
GIT_TAG "origin/master")
superbuild_set_revision(vrpn
# https://github.com/vrpn/vrpn.git
URL "http://www.paraview.org/files/dependencies/vrpn-a545ef6415f0026aabdbdb1d7fdbefeb91c47d4f.tar.bz2"
......
Markdown is supported
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