Gitlab updates will be applied Friday, July 30th at 12pm, (16:00 UTC). Gitlab could go offline for a few minutes.

Commit e6853597 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'cmb-testing-data-var'

b0670ab0 smtk: use CMB's test data root variable
Acked-by: Kitware Robot's avatarKitware Robot <>
Acked-by: Bob Obara's avatarBob Obara <>
Merge-request: !179
parents 6615b397 b0670ab0
......@@ -126,6 +126,8 @@ function (superbuild_add_tests)
superbuild_test_projects cmb smtk)
endfunction ()
set(CMB_TEST_DATA_ROOT "" CACHE PATH "Location of CMB's testing data")
......@@ -6,8 +6,6 @@ if (__BUILDBOT_INSTALL_LOCATION)
set(vtk_dir <INSTALL_DIR>/lib/cmake/paraview-${paraview_version})
endif ()
set(CMB_TEST_DATA_ROOT "" CACHE PATH "Location of CMB's testing data")
set(smtk_libdir lib)
if (WIN32)
set(smtk_libdir bin)
......@@ -19,8 +19,6 @@ if (WIN32)
set(smtk_libdir bin)
endif ()
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.
......@@ -42,7 +40,7 @@ superbuild_add_project(smtk
# This should be off by default because vtkCmbMoabReader in discrete
# session may only be needed for debugging purpose
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment