Commit 46c65eeb authored by Ben Boeckel's avatar Ben Boeckel

Merge branch 'hydrology-user-guides-release' into hydrology-user-guides

* hydrology-user-guides-release:
  apple: install paraviewweb to each application
  apple: install user guides per-application
  hydrology.bundle: package the user guides
parents f452ee0d 826b92b0
...@@ -112,11 +112,11 @@ foreach(program IN LISTS cmb_programs_to_install) ...@@ -112,11 +112,11 @@ foreach(program IN LISTS cmb_programs_to_install)
if (paraviewweb_enabled) if (paraviewweb_enabled)
install( install(
FILES "${superbuild_install_location}/Applications/paraview.app/Contents/Python/paraview/web/defaultProxies.json" FILES "${superbuild_install_location}/Applications/paraview.app/Contents/Python/paraview/web/defaultProxies.json"
DESTINATION "${cmb_package}/Contents/Python/paraview/web" DESTINATION "${cmb_package}/${program}.app/Contents/Python/paraview/web"
COMPONENT "superbuild") COMPONENT "superbuild")
install( install(
DIRECTORY "${superbuild_install_location}/share/paraview/web" DIRECTORY "${superbuild_install_location}/share/paraview/web"
DESTINATION "${cmb_package}/Contents/Resources" DESTINATION "${cmb_package}/${program}.app/Contents/Resources"
COMPONENT "superbuild") COMPONENT "superbuild")
endif () endif ()
...@@ -131,6 +131,13 @@ foreach(program IN LISTS cmb_programs_to_install) ...@@ -131,6 +131,13 @@ foreach(program IN LISTS cmb_programs_to_install)
"Contents/Plugins/${qt5_plugin_group}" "Contents/Plugins/${qt5_plugin_group}"
SEARCH_DIRECTORIES "${library_paths}") SEARCH_DIRECTORIES "${library_paths}")
endforeach () endforeach ()
if (cmb_doc_base_dir)
set(cmb_doc_dir "${cmb_package}/${program}.app/${cmb_doc_base_dir}")
endif ()
# Install PDF guides.
cmb_install_extra_data()
endforeach () endforeach ()
# FIXME: Install inside of each application? # FIXME: Install inside of each application?
......
include(hydrology.bundle.common) include(hydrology.bundle.common)
set(cmb_package "CMB-Hydro ${cmb_version_major}.${cmb_version_minor}.${cmb_version_patch}") set(cmb_package "CMB-Hydro ${cmb_version_major}.${cmb_version_minor}.${cmb_version_patch}")
set(cmb_doc_base_dir "Contents/doc")
include(cmb.bundle.apple) include(cmb.bundle.apple)
include(modelbuilder.bundle.common) include(modelbuilder.bundle.common)
set(cmb_package "ModelBuilder ${cmb_version_major}.${cmb_version_minor}.${cmb_version_patch}") set(cmb_package "ModelBuilder ${cmb_version_major}.${cmb_version_minor}.${cmb_version_patch}")
set(cmb_doc_dir "${cmb_package}/Contents/doc") set(cmb_doc_base_dir "Contents/doc")
include(cmb.bundle.apple) include(cmb.bundle.apple)
# Install PDF guides.
cmb_install_extra_data()
set(cmb_doc_dir "share/cmb/doc")
include(hydrology.bundle.common) include(hydrology.bundle.common)
include(cmb.bundle.unix) include(cmb.bundle.unix)
# Install PDF guides.
cmb_install_extra_data()
set(cmb_doc_dir "doc")
include(hydrology.bundle.common) include(hydrology.bundle.common)
include(cmb.bundle.windows) include(cmb.bundle.windows)
# Install PDF guides.
cmb_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