Re #6630. Minor changes for windows.

mantidproject · Mar 13, 2013 · c9960c5 · c9960c5
1 parent a77d10e
commit c9960c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Code/Mantid/docs/qtassistant/CMakeLists.txt b/Code/Mantid/docs/qtassistant/CMakeLists.txt
@@ -54,7 +54,7 @@ if (QT_QCOLLECTIONGENERATOR_EXECUTABLE)
    add_custom_command(OUTPUT ${HELP_FIT_OUT}
                       DEPENDS make_fitfunctions_help.py qhpfile.py fitfunctions_help.py
                       COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/make_fitfunctions_help.py
-                              -m ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR} -o ${HELP_OUT_DIR}
+                              -m ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR} -o ${HELP_OUT_DIR}
 		      )
 
    add_custom_command(OUTPUT  ${HELP_QCH_DIR}/mantid.qhc ${HELP_QCH_DIR}/algorithms.qch ${HELP_QCH_DIR}/fitfunctions.qch ${HELP_QCH_DIR}/mantidgeneral.qch

diff --git a/Code/Mantid/docs/qtassistant/qhpfile.py b/Code/Mantid/docs/qtassistant/qhpfile.py
@@ -3,10 +3,11 @@
 from assistant_common import addEle, addTxtEle
 
 class QHPFile:
-    def __init__(self, namespace, folder="doc"):
+    def __init__(self, namespace, folder="doc", prettyxml=False):
         self.__doc = Document()
         self.__root = addEle(self.__doc,"QtHelpProject", self.__doc,
                              {"version":"1.0"})
+        self.__prettyxml = prettyxml
 
         addTxtEle(self.__doc, "namespace", namespace, self.__root)
         addTxtEle(self.__doc, "virtualFolder", folder, self.__root)
@@ -45,7 +46,10 @@ def addFile(self, filename, keyword=None):
             self.__files.append(filename)
 
     def __str__(self):
-        return self.__doc.toprettyxml(indent="  ")
+        if self.__prettyxml:
+            return self.__doc.toprettyxml(indent="  ")
+        else:
+            return self.__doc.toxml()
 
     def write(self, filename):
         """