Re #9647. User has to pick either html or qtassistant.

mantidproject · Jun 13, 2014 · e9bded3 · e9bded3
1 parent 6615674
commit e9bded3
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/Code/Mantid/docs/CMakeLists.txt b/Code/Mantid/docs/CMakeLists.txt
@@ -17,21 +17,8 @@ if ( SPHINX_FOUND )
     set ( DOCS_RUNNER_EXE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/MantidPlot )
   endif()
 
-  # HTML target
-  set ( BUILDER html )
-  configure_file ( runsphinx.py.in runsphinx_html.py @ONLY )
-  add_custom_target ( ${TARGET_PREFIX}-html
-    COMMAND ${DOCS_RUNNER_EXE} -xq runsphinx_html.py
-    DEPENDS Framework MantidPlot
-    COMMENT "Building html documentation"
-  )
-  # Group within VS and exclude from whole build
-  set_target_properties ( ${TARGET_PREFIX}-html PROPERTIES FOLDER "Documentation"
-                                                EXCLUDE_FROM_DEFAULT_BUILD 1
-                                                EXCLUDE_FROM_ALL 1)
-
-  # qt-assistant target
   if (QT_QCOLLECTIONGENERATOR_EXECUTABLE)
+    # qt-assistant target
     set ( BUILDER qthelp )
     configure_file ( runsphinx.py.in runsphinx_qthelp.py @ONLY )
 
@@ -56,6 +43,19 @@ if ( SPHINX_FOUND )
 
   else (QT_QCOLLECTIONGENERATOR_EXECUTABLE)
     message (WARNING " Did not find qcollectiongenerator - cannot create qtassistant files")
+    # HTML target
+    set ( BUILDER html )
+    configure_file ( runsphinx.py.in runsphinx_html.py @ONLY )
+    add_custom_target ( ${TARGET_PREFIX}-html
+                       COMMAND ${DOCS_RUNNER_EXE} -xq runsphinx_html.py
+                       DEPENDS Framework MantidPlot
+                       COMMENT "Building html documentation"
+                       )
+    # Group within VS and exclude from whole build
+    set_target_properties ( ${TARGET_PREFIX}-html PROPERTIES FOLDER "Documentation"
+                           EXCLUDE_FROM_DEFAULT_BUILD 1
+                           EXCLUDE_FROM_ALL 1)
+
   endif (QT_QCOLLECTIONGENERATOR_EXECUTABLE)
 
   # doctest target