Re #6630. More shuffling about of directories for qtassistant.

mantidproject · Mar 5, 2013 · c286fb8 · c286fb8
1 parent 53530bb
commit c286fb8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/Code/Mantid/docs/qtassistant/CMakeLists.txt b/Code/Mantid/docs/qtassistant/CMakeLists.txt
@@ -15,7 +15,7 @@ if (QT_QCOLLECTIONGENERATOR_EXECUTABLE)
          ${HELP_IMG_DIR}/Mantid_Logo_Transparent.png
          ${HELP_IMG_DIR}/MantidPlot_Icon_32offset.png
          src/about.txt
-         src/mantidgeneral.qhp
+         ${HELP_OUT_DIR}/mantidgeneral.qhp
         )
 
    add_custom_command( OUTPUT ${HELP_IMG_DIR}/Mantid_Logo_Transparent.png
@@ -26,6 +26,9 @@ if (QT_QCOLLECTIONGENERATOR_EXECUTABLE)
                        COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/img/MantidPlot_Icon_32offset.png
                                ${HELP_IMG_DIR}/MantidPlot_Icon_32offset.png
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/img/MantidPlot_Icon_32offset.png )
+   add_custom_command( OUTPUT ${HELP_OUT_DIR}/mantidgeneral.qhp
+                       COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/src/mantidgeneral.qhp
+                               ${HELP_OUT_DIR}/mantidgeneral.qhp )
 
    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/mantid.qhcp.template
                    ${HELP_OUT_DIR}/mantid.qhcp )
@@ -50,16 +53,13 @@ if (QT_QCOLLECTIONGENERATOR_EXECUTABLE)
                               -m ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR} -o ${HELP_OUT_DIR}
 		      )
 
-   add_custom_command(OUTPUT  mantid.qhc algorithms.qch mantidgeneral.qch
+   add_custom_command(OUTPUT  ${HELP_QCH_DIR}/mantid.qhc ${HELP_QCH_DIR}/algorithms.qch ${HELP_QCH_DIR}/fitfunctions.qch ${HELP_QCH_DIR}/mantidgeneral.qch
                       DEPENDS ${HELP_ALGO_OUT} ${HELP_FIT_OUT} ${HELP_QHCP_SOURCE}
 		      COMMAND ${QT_QCOLLECTIONGENERATOR_EXECUTABLE} ${HELP_OUT_DIR}/mantid.qhcp
 		      )
 
    add_custom_target ( qtassistant ALL
-                       DEPENDS MantidPlot
-		               ${HELP_OUT_DIR}/algorithms.qhp
-			       ${HELP_OUT_DIR}/fitfunctions.qhp
-			       mantid.qhc
+                       DEPENDS MantidPlot ${HELP_QCH_DIR}/mantid.qhc
                        )
 
 #   install ( FILES mantid.qhc algorithms.qch mantidgeneral.qch

diff --git a/Code/Mantid/docs/qtassistant/mantid.qhcp.template b/Code/Mantid/docs/qtassistant/mantid.qhcp.template
@@ -3,7 +3,7 @@
      <assistant>
          <title>Mantid Help</title>
          <startPage>qthelp://org.mantidproject/doc/index.html</startPage>
-         <applicationIcon>@CMAKE_CURRENT_SOURCE_DIR@/img/MantidPlot_Icon_32offset.png</applicationIcon>
+         <applicationIcon>src/images/MantidPlot_Icon_32offset.png</applicationIcon>
          <enableFilterFunctionality>false</enableFilterFunctionality>
          <enableDocumentationManager>true</enableDocumentationManager>
          <enableAddressBar visible="true">false</enableAddressBar>
@@ -13,28 +13,28 @@
          </aboutMenuText>
          <aboutDialog>
              <file>@CMAKE_CURRENT_SOURCE_DIR@/src/about.txt</file>
-             <icon>@CMAKE_CURRENT_SOURCE_DIR@/img/Mantid_Logo_Transparent.png</icon>
+             <icon>src/images/Mantid_Logo_Transparent.png</icon>
          </aboutDialog>
      </assistant>
      <docFiles>
          <generate>
              <file>
-                 <input>@CMAKE_CURRENT_SOURCE_DIR@/src/mantidgeneral.qhp</input>
-                 <output>mantidgeneral.qch</output>
+                 <input>mantidgeneral.qhp</input>
+                 <output>qch/mantidgeneral.qch</output>
              </file>
              <file>
-                 <input>generated/algorithms.qhp</input>
-                 <output>algorithms.qch</output>
+                 <input>algorithms.qhp</input>
+                 <output>qch/algorithms.qch</output>
              </file>
              <file>
-                 <input>generated/fitfunctions.qhp</input>
-                 <output>fitfunctions.qch</output>
+                 <input>fitfunctions.qhp</input>
+                 <output>qch/fitfunctions.qch</output>
              </file>
          </generate>
          <register>
-             <file>mantidgeneral.qch</file>
-             <file>algorithms.qch</file>
-             <file>fitfunctions.qch</file>
+             <file>qch/mantidgeneral.qch</file>
+             <file>qch/algorithms.qch</file>
+             <file>qch/fitfunctions.qch</file>
          </register>
      </docFiles>
 </QHelpCollectionProject>