Commit 2947819a authored by Ben Boeckel's avatar Ben Boeckel

paraview: hard-depend on netcdf

Rework dependencies. Always build ParaView with an external netcdf. Also
always depend on hdf5 for smtk in the superbuild.
parent 7263a655
......@@ -58,12 +58,6 @@ endif()
#set of quotes into pqparaviewInitializer, and break the build
set(optional_plugins CMB_Plugin+KMLExporter_Plugin)
set(paraview_depends)
if (ENABLE_netcdf OR netcdf_ENABLED)
list(APPEND paraview_depends
netcdfcpp)
endif ()
add_external_project(paraview
DEPENDS
boost
......@@ -74,9 +68,11 @@ add_external_project(paraview
# Doesn't work for OpenGL2 yet
# visitbridge
zlib
netcdf
netcdfcpp
${paraview_depends}
DEPENDS_OPTIONAL
freetype ffmpeg hdf5 libxml3 manta mpi silo cgns mesa osmesa netcdf netcdfcpp
freetype ffmpeg hdf5 libxml3 manta mpi silo cgns mesa osmesa
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_TESTING:BOOL=OFF
......
......@@ -21,8 +21,8 @@ set(SMTK_PLUGIN_SUBDIR "${smtk_libdir}" CACHE INTERNAL "SMTK's plugin directory"
set(SMTK_DATA_DIR "" CACHE PATH "Location of SMTK's testing data")
add_external_project_or_just_build_dependencies(smtk
DEPENDS boost qt shiboken paraview remus
DEPENDS_OPTIONAL moab netcdf netcdfcpp hdf5
DEPENDS boost qt shiboken paraview remus hdf5
DEPENDS_OPTIONAL moab netcdf netcdfcpp
CMAKE_ARGS
${extra_cmake_args}
"-C${CMAKE_BINARY_DIR}/env.cmake"
......
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