Re #6630. Move qtassistant results to better serve windoze.

mantidproject · Mar 5, 2013 · 34168ef · 34168ef
1 parent ccd92bd
commit 34168ef
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/Code/Mantid/docs/qtassistant/CMakeLists.txt b/Code/Mantid/docs/qtassistant/CMakeLists.txt
@@ -5,45 +5,45 @@
 if (QT_QCOLLECTIONGENERATOR_EXECUTABLE)
    message (STATUS "Adding information for qtassistant: mantid.qhc")
    set (HELP_QHCP_SOURCE 
-         ${CMAKE_BINARY_DIR}/qtassistant/mantid.qhcp
+         ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/qtassistant/mantid.qhcp
          img/Mantid_Logo_Transparent.png
          img/MantidPlot_Icon_32offset.png
          src/about.txt
          src/mantidgeneral.qhp
         )
 
    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/mantid.qhcp.template
-                   ${CMAKE_BINARY_DIR}/qtassistant/mantid.qhcp )
+                   ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/qtassistant/mantid.qhcp )
 
    set ( HELP_ALGO_OUT
-         ${CMAKE_BINARY_DIR}/qtassistant/generated/algorithms.qhp
-         ${CMAKE_BINARY_DIR}/qtassistant/generated/algorithms_index.html )
+         ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/qtassistant/generated/algorithms.qhp
+         ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/qtassistant/generated/algorithms_index.html )
 
    set ( HELP_FIT_OUT
-         ${CMAKE_BINARY_DIR}/qtassistant/generated/fitfunctions.qhp
-         ${CMAKE_BINARY_DIR}/qtassistant/generated/fitfunctions_index.html )
+         ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/qtassistant/generated/fitfunctions.qhp
+         ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/qtassistant/generated/fitfunctions_index.html )
 
    add_custom_command(OUTPUT ${HELP_ALGO_OUT}
                       DEPENDS make_algorithms_help.py qhpfile.py algorithm_help.py
                       COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/make_algorithms_help.py
-                              -m ${CMAKE_BINARY_DIR} -o ${CMAKE_BINARY_DIR}/qtassistant/generated
+                              -m ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR} -o ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/qtassistant/generated
 		      )
 
    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} -o ${CMAKE_BINARY_DIR}/qtassistant/generated
+                              -m ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR} -o ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/qtassistant/generated
 		      )
 
    add_custom_command(OUTPUT  mantid.qhc algorithms.qch mantidgeneral.qch
                       DEPENDS ${HELP_ALGO_OUT} ${HELP_FIT_OUT} ${HELP_QHCP_SOURCE}
-		      COMMAND ${QT_QCOLLECTIONGENERATOR_EXECUTABLE} ${CMAKE_BINARY_DIR}/qtassistant/mantid.qhcp
+		      COMMAND ${QT_QCOLLECTIONGENERATOR_EXECUTABLE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/qtassistant/mantid.qhcp
 		      )
 
    add_custom_target ( qtassistant ALL
                        DEPENDS MantidPlot
-		               ${CMAKE_BINARY_DIR}/qtassistant/generated/algorithms.qhp
-			       ${CMAKE_BINARY_DIR}/qtassistant/generated/fitfunctions.qhp
+		               ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/qtassistant/generated/algorithms.qhp
+			       ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/qtassistant/generated/fitfunctions.qhp
 			       mantid.qhc
                        )