Merge topic 'smtk-required'

29e259cd cmb: require smtk for now
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !119

projects/cmb.cmake

@@ -24,6 +24,7 @@ superbuild_add_project(cmb
   DEFAULT_ON
   DEPENDS boost remus vxl kml gdal qt4 python paraview shiboken
           cmbworkflows zeromq
+          smtk # XXX(smtk): until the submodule works properly
   DEPENDS_OPTIONAL moab smtk ${cmb_extra_optional_dependencies}
   CMAKE_ARGS
     ${extra_cmake_args}

projects/smtk.cmake

@@ -23,7 +23,6 @@ set(SMTK_DATA_DIR "" CACHE PATH "Location of SMTK's testing data")
 
 superbuild_add_project(smtk
   DEVELOPER_MODE
-  DEFAULT_ON # XXX: until CMB's internal SMTK works again.
   DEPENDS boost qt4 shiboken paraview python remus hdf5 zeromq
   DEPENDS_OPTIONAL moab netcdf
   CMAKE_ARGS