Commit 6c0fc1bd authored by David Thompson's avatar David Thompson Committed by Kitware Robot

Merge topic 'parflow-by-default'

69755657 Turn on ParFlow plugin & nlohmann_json by default.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !576
parents 5ec5af67 69755657
Pipeline #135943 failed with stage
in 0 seconds
...@@ -51,6 +51,7 @@ function (superbuild_find_projects var) ...@@ -51,6 +51,7 @@ function (superbuild_find_projects var)
matplotlib matplotlib
mpi mpi
netcdf netcdf
nlohmannjson
numpy numpy
ospray ospray
openimagedenoise openimagedenoise
...@@ -336,6 +337,9 @@ set(_git_clone_arguments_default --progress) ...@@ -336,6 +337,9 @@ set(_git_clone_arguments_default --progress)
# set the default for cxx11 to be enabled for this project # set the default for cxx11 to be enabled for this project
set(_superbuild_default_cxx11 ON) set(_superbuild_default_cxx11 ON)
# Enable nlohmann_json by default
set(_superbuild_default_nlohmannjson ON)
# set the default for qt5 to be 5.8 # set the default for qt5 to be 5.8
set(_superbuild_qt5_default_selection "5.8") set(_superbuild_qt5_default_selection "5.8")
......
...@@ -145,6 +145,7 @@ superbuild_add_project(paraview ...@@ -145,6 +145,7 @@ superbuild_add_project(paraview
cuda boost matplotlib mpi numpy png cuda boost matplotlib mpi numpy png
python qt5 visitbridge zlib silo las python qt5 visitbridge zlib silo las
xdmf3 ospray vrpn vtkm tbb netcdf xdmf3 ospray vrpn vtkm tbb netcdf
nlohmannjson
paraviewgettingstartedguide paraviewgettingstartedguide
paraviewtutorialdata paraviewweb paraviewtutorialdata paraviewweb
paraviewpluginsexternal paraviewpluginsexternal
...@@ -213,6 +214,9 @@ superbuild_add_project(paraview ...@@ -213,6 +214,9 @@ superbuild_add_project(paraview
# Web # Web
-DPARAVIEW_ENABLE_WEB:BOOL=${paraviewweb_enabled} -DPARAVIEW_ENABLE_WEB:BOOL=${paraviewweb_enabled}
# ParFlow
-DPARAVIEW_PLUGIN_ENABLE_ParFlow:BOOL=${nlohmannjson_enabled}
# add additional plugin directories # add additional plugin directories
-DPARAVIEW_EXTERNAL_PLUGIN_DIRS:STRING=${paraview_plugin_dirs} -DPARAVIEW_EXTERNAL_PLUGIN_DIRS:STRING=${paraview_plugin_dirs}
......
Subproject commit 37c88ad501eb3304af52cb9eef5ab651734acd5c Subproject commit 8bf7cfcfec7f3e4ff5459ee3f0c60d6355c35320
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