Re #6630. Removed the need for a template qhcp file.

Now all of the files are copied into the build area and magic happens.
mantidproject · Mar 6, 2013 · 44be340 · 44be340
1 parent ee97d98
commit 44be340
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Code/Mantid/docs/qtassistant/CMakeLists.txt b/Code/Mantid/docs/qtassistant/CMakeLists.txt
@@ -14,7 +14,7 @@ if (QT_QCOLLECTIONGENERATOR_EXECUTABLE)
          ${HELP_OUT_DIR}/mantid.qhcp
          ${HELP_IMG_DIR}/Mantid_Logo_Transparent.png
          ${HELP_IMG_DIR}/MantidPlot_Icon_32offset.png
-         src/about.txt
+         ${HELP_OUT_DIR}/about.txt
          ${HELP_OUT_DIR}/mantidgeneral.qhp
         )
 
@@ -29,9 +29,13 @@ if (QT_QCOLLECTIONGENERATOR_EXECUTABLE)
    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 )
+   add_custom_command( OUTPUT ${HELP_OUT_DIR}/about.txt
+                       COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/src/about.txt
+                               ${HELP_OUT_DIR}/about.txt )
 
-   configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/mantid.qhcp.template
-                   ${HELP_OUT_DIR}/mantid.qhcp )
+   add_custom_command( OUTPUT ${HELP_OUT_DIR}/mantid.qhcp
+                       COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/mantid.qhcp
+                               ${HELP_OUT_DIR}/mantid.qhcp )
 
    set ( HELP_ALGO_OUT
          ${HELP_OUT_DIR}/algorithms.qhp

diff --git a/...tid/docs/qtassistant/mantid.qhcp.template → Code/Mantid/docs/qtassistant/mantid.qhcp b/...tid/docs/qtassistant/mantid.qhcp.template → Code/Mantid/docs/qtassistant/mantid.qhcp
@@ -12,7 +12,7 @@
              <text>About Mantid</text>
          </aboutMenuText>
          <aboutDialog>
-             <file>@CMAKE_CURRENT_SOURCE_DIR@/src/about.txt</file>
+             <file>about.txt</file>
              <icon>src/images/Mantid_Logo_Transparent.png</icon>
          </aboutDialog>
      </assistant>