Commit 006b53a7 authored by Sebastien Jourdain's avatar Sebastien Jourdain

Fix bundle location for ParaViewWeb apps

parent c770f871
Pipeline #32384 passed with stage
......@@ -126,16 +126,12 @@ set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_LIST_DIR}/files/CMakeDMGBackgrou
set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/CMakeDMGSetup.scpt")
if (paraviewweb_enabled)
install(
PROGRAMS "${superbuild_install_location}/bin/pvw-visualizer.py"
DESTINATION "${paraview_appname}/Contents/bin"
COMPONENT "superbuild")
install(
FILES "${superbuild_install_location}/Applications/paraview.app/Contents/Python/paraview/web/defaultProxies.json"
DESTINATION "${paraview_appname}/Contents/Python/paraview/web"
COMPONENT "superbuild")
install(
DIRECTORY "${superbuild_install_location}/share/paraview/www"
DIRECTORY "${superbuild_install_location}/share/paraview/web"
DESTINATION "${paraview_appname}/Contents/Resources"
COMPONENT "superbuild")
endif ()
......
......@@ -8,6 +8,3 @@ superbuild_add_project(paraviewwebvisualizer
-Dsource_location:PATH=<SOURCE_DIR>
-Dinstall_location:PATH=<INSTALL_DIR>
-P "${CMAKE_CURRENT_LIST_DIR}/scripts/paraviewwebvisualizer.install.cmake")
# TODO: Install into packages when ParaView no longer ships its paraviewweb
# stuff.
file(INSTALL
${source_location}/dist/
DESTINATION "${install_location}/share/paraview/www/visualizer")
DESTINATION "${install_location}/share/paraview/web/visualizer/www")
file(INSTALL
${source_location}/server/pvw-visualizer.py
DESTINATION "${install_location}/bin")
${source_location}/server/
DESTINATION "${install_location}/share/paraview/web/visualizer/server")
......@@ -39,16 +39,12 @@ if (paraview_has_gui)
endif ()
if (paraviewweb_enabled)
install(
PROGRAMS "${superbuild_install_location}/bin/pvw-visualizer.py"
DESTINATION "bin"
COMPONENT "${paraview_component}")
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/www"
DIRECTORY "${superbuild_install_location}/share/paraview/web"
DESTINATION "share/paraview-${paraview_version}"
COMPONENT "${paraview_component}")
endif ()
......@@ -94,16 +94,12 @@ if (paraviewweb_enabled)
DESTINATION "bin/Lib/site-packages"
COMPONENT "superbuild")
install(
PROGRAMS "${superbuild_install_location}/bin/pvw-visualizer.py"
DESTINATION "bin"
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/www"
DIRECTORY "${superbuild_install_location}/share/paraview/web"
DESTINATION "share/paraview-${paraview_version}"
COMPONENT "superbuild")
endif ()
......@@ -115,14 +111,6 @@ if (qt4_built_by_superbuild OR qt5_built_by_superbuild)
"bin"
"${library_paths}")
endforeach ()
# Install ParaViewWeb www directory.
# FIXME: Web is currently disabled on Windows builds of ParaView.
#install(
# DIRECTORY "${superbuild_install_location}/share/paraview-${paraview_version}/www"
# DESTINATION "share/paraview-${paraview_version}"
# COMPONENT ParaView
# USE_SOURCE_PERMISSIONS)
endif ()
paraview_install_extra_data()
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