Commit 1d8577e3 authored by Yumin Yuan's avatar Yumin Yuan Committed by Kitware Robot

Merge topic 'cmb_test_plugin_paths'

00ae655e Added a definition for cmb test plugin paths
1f6cdcca Move paraview sha1 to master of May 11 2015
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !37
parents 2d24a4e0 00ae655e
......@@ -20,6 +20,8 @@ add_external_project_or_just_build_dependencies(cmb
-DVTK_DIR:PATH=${vtk_dir}
-DMoleQueue_DIR:PATH=<INSTALL_DIR>
#specify semi-colon separated paths for session plugins
-DCMB_TEST_PLUGIN_PATHS:STRING=<INSTALL_DIR>/lib
#specify what mesh workers we should build
-DBUILD_TRIANGLE_MESH_WORKER:BOOL=${triangle_ENABLED}
......
......@@ -98,10 +98,9 @@ if(USE_PARAVIEW_master)
GIT_TAG master)
else()
add_revision(paraview
# updating to ParaView master of 2015-05-11
# has the updates to cell and point blanking
# updating to ParaView master of May 11, 2015
GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"
GIT_TAG e35c150633c629837482843ad1ed03978c)
GIT_TAG e35c150633c629837482843ad1ed03978cda267a)
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