Commit 512667a1 authored by Jacob Becker's avatar Jacob Becker

Merge remote-tracking branch 'origin/master' into add_opencv

parents 3275ffee 16ecfdd6
[submodule "superbuild"] [submodule "superbuild"]
path = superbuild path = superbuild
url = https://gitlab.kitware.com/ben.boeckel/common-superbuild.git url = https://gitlab.kitware.com/paraview/common-superbuild.git
...@@ -114,9 +114,9 @@ endfunction () ...@@ -114,9 +114,9 @@ endfunction ()
macro (superbuild_setup_tests) macro (superbuild_setup_tests)
if (cmb_enabled) if (cmb_enabled)
set(CTEST_DROP_LOCATION "/submit.php?project=CMB") set(DROP_LOCATION "/submit.php?project=CMB")
else (smtk_enabled) else (smtk_enabled)
set(CTEST_DROP_LOCATION "/submit.php?project=SMTK") set(DROP_LOCATION "/submit.php?project=SMTK")
endif () endif ()
endmacro () endmacro ()
......
...@@ -21,10 +21,12 @@ endif () ...@@ -21,10 +21,12 @@ endif ()
set(SMTK_DATA_DIR "" CACHE PATH "Location of SMTK's testing data") set(SMTK_DATA_DIR "" CACHE PATH "Location of SMTK's testing data")
#explicitly depend on gdal so we inherit the location of the GDAL library
#which FindGDAL.cmake fails to find, even when given GDAL_DIR.
superbuild_add_project(smtk superbuild_add_project(smtk
DEVELOPER_MODE DEVELOPER_MODE
DEBUGGABLE DEBUGGABLE
DEPENDS boost cxx11 qt4 shiboken paraview python remus hdf5 zeromq DEPENDS boost cxx11 qt4 shiboken paraview python remus hdf5 zeromq gdal
DEPENDS_OPTIONAL moab netcdf cgm DEPENDS_OPTIONAL moab netcdf cgm
CMAKE_ARGS CMAKE_ARGS
${smtk_extra_cmake_args} ${smtk_extra_cmake_args}
...@@ -55,6 +57,9 @@ superbuild_add_project(smtk ...@@ -55,6 +57,9 @@ superbuild_add_project(smtk
-DNETCDF_ROOT:PATH=<INSTALL_DIR> -DNETCDF_ROOT:PATH=<INSTALL_DIR>
-DParaView_DIR:PATH=${paraview_dir} -DParaView_DIR:PATH=${paraview_dir}
# GDAL bits to properly enable gdal classes ( mainly wrapper )
# that we need to build
-DGDAL_DIR:PATH=<INSTALL_DIR>
-DSMTK_FIND_SHIBOKEN:STRING=) -DSMTK_FIND_SHIBOKEN:STRING=)
......
Subproject commit d6ac5149533a068d60e89bb6376b05d1a4620112 Subproject commit 269baff74ee7e65bebfbdc2e2f2e33795da6d287
...@@ -4,7 +4,10 @@ superbuild_set_revision(boost ...@@ -4,7 +4,10 @@ superbuild_set_revision(boost
# XXX: When updating this, update the version number in CMakeLists.txt as well. # XXX: When updating this, update the version number in CMakeLists.txt as well.
# Using ParaView 5.1.2 # Using ParaView 5.1.2
set(paraview_revision v5.1.2) #
# Currently using a snapshot of ParaView that is based on 5.1.2 but has no
# version of its own, so I'm leaving the CMakeLists.txt variable as is
set(paraview_revision 602bc96d956767617f133bb63554690bf0cb227c)
if (USE_PARAVIEW_master) if (USE_PARAVIEW_master)
set(paraview_revision origin/master) set(paraview_revision origin/master)
endif () endif ()
......
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