Commit 3ef23974 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'add-pvweb'

98ef3830 paraviewweb: add pvweb bits to CMB packages
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Bob Obara's avatarBob Obara <bob.obara@kitware.com>
Merge-request: !212
parents b8babed7 98ef3830
......@@ -34,6 +34,9 @@ function (superbuild_find_projects var)
oce
opencv
paraview
paraviewweb
paraviewwebvisualizer
paraviewweblightviz
png
python
pythongirderclient
......@@ -58,7 +61,8 @@ function (superbuild_find_projects var)
if (WIN32)
list(APPEND projects
ftjam
pythonsetuptools)
pythonsetuptools
pywin32)
endif ()
option(USE_NONFREE_COMPONENTS "Enable the non-free parts of the superbuild" OFF)
......
......@@ -108,6 +108,17 @@ foreach(program IN LISTS cmb_programs_to_install)
DESTINATION "${cmb_package}/${program}.app/Contents/Python/requests"
COMPONENT superbuild)
endif ()
if (paraviewweb_enabled)
install(
FILES "${superbuild_install_location}/Applications/paraview.app/Contents/Python/paraview/web/defaultProxies.json"
DESTINATION "${cmb_package}/Contents/Python/paraview/web"
COMPONENT "superbuild")
install(
DIRECTORY "${superbuild_install_location}/share/paraview/web"
DESTINATION "${cmb_package}/Contents/Resources"
COMPONENT "superbuild")
endif ()
endforeach ()
# FIXME: Install inside of each application?
......
......@@ -103,3 +103,18 @@ if (pythongirderclient_enabled)
requests
girder_client)
endif ()
if (paraviewweb_enabled)
list(APPEND python_modules
autobahn
twisted
zope)
if (WIN32)
list(APPEND python_modules
adodbapi
isapi
pythoncom
win32com)
endif ()
endif ()
......@@ -63,7 +63,7 @@ superbuild_add_project(paraview
zlib
netcdf
DEPENDS_OPTIONAL
cxx11 freetype hdf5
cxx11 freetype hdf5 paraviewweb
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_TESTING:BOOL=OFF
......@@ -75,6 +75,7 @@ superbuild_add_project(paraview
-DVTK_USE_SYSTEM_HDF5:BOOL=${hdf5_enabled}
-DVTK_USE_SYSTEM_NETCDF:BOOL=${netcdf_enabled}
-DVTK_RENDERING_BACKEND:STRING=OpenGL2
-DPARAVIEW_ENABLE_WEB:BOOL=${paraviewweb_enabled}
#currently catalyst is having problems on praxis so lets disable it for now
-DPARAVIEW_ENABLE_CATALYST:BOOL=OFF
......
set(paraviewweb_depends)
if (WIN32)
list(APPEND paraviewweb_depends
pywin32)
endif ()
superbuild_add_dummy_project(paraviewweb
DEPENDS python paraviewwebvisualizer paraviewweblightviz ${paraviewweb_depends})
superbuild_add_project(paraviewweblightviz
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
"${CMAKE_COMMAND}"
-Dsource_location:PATH=<SOURCE_DIR>
-Dinstall_location:PATH=<INSTALL_DIR>
-P "${CMAKE_CURRENT_LIST_DIR}/scripts/paraviewweblightviz.install.cmake")
superbuild_add_project(paraviewwebvisualizer
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
"${CMAKE_COMMAND}"
-Dsource_location:PATH=<SOURCE_DIR>
-Dinstall_location:PATH=<INSTALL_DIR>
-P "${CMAKE_CURRENT_LIST_DIR}/scripts/paraviewwebvisualizer.install.cmake")
......@@ -73,6 +73,17 @@ endif ()
include(python.functions)
superbuild_install_superbuild_python()
if (paraviewweb_enabled)
install(
FILES "${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages/paraview/web/defaultProxies.json"
DESTINATION "lib/python2.7/site-packages/paraview/web"
COMPONENT "${paraview_component}")
install(
DIRECTORY "${superbuild_install_location}/share/paraview/web"
DESTINATION "share/paraview-${paraview_version}"
COMPONENT "${paraview_component}")
endif ()
set(plugins_file "${CMAKE_CURRENT_BINARY_DIR}/.plugins")
cmb_add_plugin("${plugins_file}" ${plugins})
......
......@@ -88,6 +88,27 @@ if (pythonrequests_enabled)
COMPONENT superbuild)
endif ()
if (paraviewweb_enabled)
install(
DIRECTORY "${superbuild_install_location}/bin/Lib/site-packages/win32"
DESTINATION "bin/Lib/site-packages"
COMPONENT "superbuild")
install(
FILES "${superbuild_install_location}/bin/Lib/site-packages/pywin32.pth"
"${superbuild_install_location}/bin/Lib/site-packages/pywin32.version.txt"
DESTINATION "bin/Lib/site-packages"
COMPONENT "superbuild")
install(
FILES "${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages/paraview/web/defaultProxies.json"
DESTINATION "bin/Lib/site-packages/paraview/web"
COMPONENT "superbuild")
install(
DIRECTORY "${superbuild_install_location}/share/paraview/web"
DESTINATION "share/paraview-${paraview_version}"
COMPONENT "superbuild")
endif ()
set(plugins_file "${CMAKE_CURRENT_BINARY_DIR}/.plugins")
cmb_add_plugin("${plugins_file}" ${plugins})
......
......@@ -98,3 +98,11 @@ superbuild_set_revision(cgm
# https://bitbucket.org/mathstuf/cgm.git
URL "http://www.paraview.org/files/dependencies/cgm-fd563100bc4d194721d5a2be8775a613738326f6.tar.bz2"
URL_MD5 f875003c15ef43f3bfb4da8ded95d73c)
superbuild_set_revision(paraviewwebvisualizer
URL "http://www.paraview.org/files/dependencies/visualizer-2.0.12.tar.gz"
URL_MD5 56e7e241ea6ad66b44469fc3186f47d6)
superbuild_set_revision(paraviewweblightviz
URL "http://www.paraview.org/files/dependencies/light-viz-1.16.1.tar.gz"
URL_MD5 9ac1937cf07ae57bf85c3240f921679a)
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