Merge topic 'hydrology-user-guides' into release

826b92b0 apple: install paraviewweb to each application
c6ccbb19 apple: install user guides per-application
2c93e28d

 hydrology.bundle: package the user guides
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona <tj.corona@kitware.com>
Merge-request: !377

projects/apple/cmb.bundle.apple.cmake

@@ -112,13 +112,20 @@ foreach(program IN LISTS cmb_programs_to_install)
   if (paraviewweb_enabled)
     install(
       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")
     install(
       DIRECTORY   "${superbuild_install_location}/share/paraview/web"
-      DESTINATION "${cmb_package}/Contents/Resources"
+      DESTINATION "${cmb_package}/${program}.app/Contents/Resources"
       COMPONENT   "superbuild")
   endif ()
+
+  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 ()
 
 # FIXME: Install inside of each application?

projects/apple/hydrology.bundle.cmake

 include(hydrology.bundle.common)
 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)

projects/apple/modelbuilder.bundle.cmake

 include(modelbuilder.bundle.common)
 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)
-
-# Install PDF guides.
-cmb_install_extra_data()

projects/unix/hydrology.bundle.cmake

+set(cmb_doc_dir "share/cmb/doc")
+
 include(hydrology.bundle.common)
 include(cmb.bundle.unix)
+
+# Install PDF guides.
+cmb_install_extra_data()

projects/win32/hydrology.bundle.cmake

+set(cmb_doc_dir "doc")
+
 include(hydrology.bundle.common)
 include(cmb.bundle.windows)
+
+# Install PDF guides.
+cmb_install_extra_data()