Refs #6101. Small cleanup of CMakeLists

mantidproject · Jan 30, 2013 · 69984d1 · 69984d1
1 parent d051a95
commit 69984d1
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/Code/Mantid/docs/qtassistant/CMakeLists.txt b/Code/Mantid/docs/qtassistant/CMakeLists.txt
@@ -6,27 +6,33 @@ if (QT_QCOLLECTIONGENERATOR_EXECUTABLE)
    message (STATUS "Adding information for qtassistant: mantid.qhc")
    set (HELP_QHCP_SOURCE 
          mantid.qhcp
-         #generated/algorithms_index.html
-         #generated/algorithms.qhp
          img/Mantid_Logo_Transparent.png
          img/MantidPlot_Icon_32offset.png
          src/about.txt
-         #src/fitfunctions.html
          src/mantidgeneral.qhp
         )
 
-   add_custom_command(OUTPUT generated/algorithms_index.html generated/algorithms.qhp
+   set ( HELP_ALGO_OUT
+         generated/algorithms.qhp
+         generated/algorithms_index.html )
+
+   set ( HELP_FIT_OUT
+         generated/fitfunctions.qhp
+         generated/fitfunctions_index.html )
+
+
+   add_custom_command(OUTPUT ${HELP_ALGO_OUT}
                       DEPENDS make_algorithms_help.py qhpfile.py
                       COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/make_algorithms_help.py -m ${CMAKE_BINARY_DIR}
 		      )
 
-   add_custom_command(OUTPUT generated/fitfunctions_index.html generated/fitfunctions.qhp
+   add_custom_command(OUTPUT ${HELP_FIT_OUT}
                       DEPENDS make_fitfunctions_help.py qhpfile.py
                       COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/make_fitfunctions_help.py -m ${CMAKE_BINARY_DIR}
 		      )
 
    add_custom_command(OUTPUT  mantid.qhc algorithms.qch mantidgeneral.qch
-                      DEPENDS generated/algorithms_index.html generated/algorithms.qhp generated/fitfunctions_index.html generated/fitfunctions.qhp ${HELP_QHCP_SOURCE}
+                      DEPENDS ${HELP_ALGO_OUT} ${HELP_FIT_OUT} ${HELP_QHCP_SOURCE}
 		      COMMAND ${QT_QCOLLECTIONGENERATOR_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mantid.qhcp
 		      )