Merge branch 'bugfix/9629_fix_offline_docs_in_app_bundle' into develop

Conflicts: Code/Mantid/Build/Jenkins/buildscript Refs #9629
mantidproject · Jun 19, 2014 · b1f3d1a · b1f3d1a
2 parents f0e02e3 + b409b64
commit b1f3d1a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Code/Mantid/Build/Jenkins/buildscript b/Code/Mantid/Build/Jenkins/buildscript
@@ -45,6 +45,9 @@ if [[ ${JOB_NAME} == *clean* ]]; then
       echo "Warning: Unknown job type. Using release-mode cpack variables"
       PACKAGINGVARS="-DCPACK_SET_DESTDIR=ON -DPACKAGE_DOCS=ON"
     fi
+  else
+    # Mac packaging
+    PACKAGINGVARS="-DPACKAGE_DOCS=ON"
   fi
 fi
 

diff --git a/Code/Mantid/docs/CMakeLists.txt b/Code/Mantid/docs/CMakeLists.txt
@@ -145,16 +145,16 @@ if ( SPHINX_FOUND )
      # must "make qtassistant" before "make package" otherwise there will be a build failure
      install (FILES ${SPHINX_BUILD_DIR}/qthelp/MantidProject.qhc
                     ${SPHINX_BUILD_DIR}/qthelp/MantidProject.qch
-              DESTINATION ${HTML_DOCS_DEST} )
+              DESTINATION ${INBUNDLE}${HTML_DOCS_DEST} )
      install ( DIRECTORY  ${SPHINX_BUILD_DIR}/qthelp/
-              DESTINATION ${HTML_DOCS_DEST}
+              DESTINATION ${INBUNDLE}${HTML_DOCS_DEST}
               FILES_MATCHING PATTERN "*.html" )
      install ( DIRECTORY  ${SPHINX_BUILD_DIR}/qthelp/_images/
                           ${SPHINX_BUILD_DIR}/qthelp/_static/
-              DESTINATION ${HTML_DOCS_DEST} )
+              DESTINATION ${INBUNDLE}${HTML_DOCS_DEST} )
     else( QT_QCOLLECTIONGENERATOR_EXECUTABLE)
-      install ( DIRECTORY ${SPHINX_BUILD_DIR}/html
-               DESTINATION ${HTML_DOCS_DEST} )
+      install ( DIRECTORY ${SPHINX_BUILD_DIR}/html/
+               DESTINATION ${INBUNDLE}${HTML_DOCS_DEST} )
     endif ( QT_QCOLLECTIONGENERATOR_EXECUTABLE )
   endif ( PACKAGE_DOCS )
 else ( SPHINX_FOUND )