Commit b1f274b5 authored by T.J. Corona's avatar T.J. Corona Committed by Kitware Robot

Merge topic 'neams-2' into release

bc7c7c6b Revert to tracking our custom version of PyARC.
2b7b796b BUG: Ammend the pyarc url
13741e34 Track NEAMS version of PyARC.
dd1bdd15 Update SMTK branch location
4cfb33a1 Add pyarc to the superbuild.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Haocheng LIU's avatarHaocheng LIU <haocheng.liu@kitware.com>
Merge-request: !436
parents 1d65380a bc7c7c6b
......@@ -61,6 +61,7 @@ function (superbuild_find_projects var)
paraviewwebvisualizer
paraviewweblightviz
png
pyarc
pybind11
python
pythongirderclient
......
......@@ -117,6 +117,13 @@ foreach(program IN LISTS cmb_programs_to_install)
COMPONENT superbuild)
endif ()
if (pyarc_enabled)
install(
DIRECTORY "${superbuild_install_location}/lib/python2.7/site-packages/PyArc"
DESTINATION "${cmb_package}/${program}.app/Contents/Python"
COMPONENT superbuild)
endif ()
if (pythonrequests_enabled)
install(
FILES "${superbuild_install_location}/lib/python2.7/site-packages/requests/cacert.pem"
......
......@@ -61,7 +61,6 @@ set(cmb_plugins_smtk
smtkPolygonSessionPlugin
smtkRemoteSessionPlugin
smtkRemusMeshOperatorPlugin
smtkRGGSessionPlugin
smtkVTKOperatorsPlugin
)
......@@ -75,6 +74,11 @@ if (matplotlib_enabled)
smtkMatplotlibPlugin)
endif ()
if (pyarc_enabled)
list(APPEND cmb_plugins_smtk
smtkRGGSessionPlugin)
endif ()
if (vxl_enabled)
list(APPEND cmb_plugins_smtk
smtkVXLOperatorViewsPlugin)
......
superbuild_add_project(pyarc
DEPENDS python
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND
"${CMAKE_COMMAND}"
-E make_directory
"<INSTALL_DIR>/lib/python2.7/site-packages/PyArc"
BUILD_COMMAND
<SOURCE_DIR>/scripts/dependencies.sh
INSTALL_COMMAND
tar xzf "<SOURCE_DIR>/PyARC.tar.gz"
-C "<INSTALL_DIR>/lib/python2.7/site-packages/PyArc"
)
......@@ -42,7 +42,7 @@ superbuild_add_project(smtk
DEFAULT_ON
INDEPENDENT_STEP_TARGETS ${smtk_lfs_steps} download update
DEPENDS boost cxx11 hdf5 netcdf nlohmannjson
DEPENDS_OPTIONAL cgm cumulus gdal moab netcdf opencv paraview pybind11 python
DEPENDS_OPTIONAL cgm cumulus gdal moab netcdf opencv paraview pyarc pybind11 python
matplotlib remus shiboken qt qt4 qt5 vtkonly vxl
CMAKE_ARGS
${smtk_extra_cmake_args}
......@@ -57,6 +57,7 @@ superbuild_add_project(smtk
-DSMTK_ENABLE_EXODUS_SESSION:BOOL=${paraview_enabled}
-DSMTK_ENABLE_REMOTE_SESSION:BOOL=${remus_enabled}
-DSMTK_ENABLE_REMUS_SUPPORT:BOOL=${remus_enabled}
-DSMTK_ENABLE_RGG_SESSION:BOOL={pyarc_enabled}
-DSMTK_ENABLE_PYTHON_WRAPPING:BOOL=${smtk_enable_python_wrapping}
-DSMTK_ENABLE_MATPLOTLIB:BOOL=${matplotlib_enabled}
-DSMTK_USE_PYBIND11:BOOL=${pybind11_enabled}
......
......@@ -146,6 +146,10 @@ superbuild_set_revision(paraviewweblightviz
URL "http://www.paraview.org/files/dependencies/light-viz-1.16.1.tar.gz"
URL_MD5 9ac1937cf07ae57bf85c3240f921679a)
superbuild_set_revision(pyarc
GIT_REPOSITORY "git@kwgitlab.kitware.com:bob.obara/PyARC.git"
GIT_TAG reorganization)
superbuild_set_revision(cmbusersguide
URL "https://media.readthedocs.org/pdf/cmb/master/cmb.pdf")
......
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