Merge topic 'smtk-moab'

8d8a07da moab: use an updated version
3d678bc6 smtk: use the system moab
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !67

Projects/smtk.cmake

@@ -36,10 +36,15 @@ add_external_project_or_just_build_dependencies(smtk
     -DSMTK_ENABLE_REMOTE_SESSION:BOOL=ON
     -DSMTK_ENABLE_REMUS_SUPPORT:BOOL=ON
     -DSMTK_ENABLE_PYTHON_WRAPPING:BOOL=${shiboken_ENABLED}
-    -DSMTK_ENABLE_MOAB_SUPPORT:BOOL=${moab_ENABLED}
     -DCMAKE_INSTALL_LIBDIR:STRING=${smtk_libdir}
     -DSMTK_DATA_DIR:PATH=${SMTK_DATA_DIR}
 
+    # TODO: remove this variable since MOAB is always available.
+    -DSMTK_ENABLE_MOAB_DISCRETE_READER:BOOL=ON
+
+    -DSMTK_USE_SYSTEM_MOAB:BOOL=${moab_ENABLED}
+    -DMOAB_INCLUDE_DIR:PATH=<INSTALL_DIR>/include
+
     -DParaView_DIR:PATH=${paraview_dir}
     -DBOOST_INCLUDEDIR:PATH=<INSTALL_DIR>/include/boost
     -DBOOST_LIBRARYDIR:PATH=<INSTALL_DIR>/lib

versions.cmake

@@ -224,8 +224,8 @@ add_revision(cgm
   )
 
 add_revision(moab
-  GIT_REPOSITORY "https://github.com/judajake/moab.git"
-  GIT_TAG "624c4e95ad1e935a7937a1b10bf252632d4496d1"
+  GIT_REPOSITORY "https://bitbucket.org/mathstuf/moab.git"
+  GIT_TAG "windows-with-cmake-support"
   )
 
 #------------------------------------------------------------------------------