Fix documentation build

Author: sethrj

cmake/FindSphinx.cmake

@@ -19,8 +19,3 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Sphinx
                                   "Failed to locate sphinx-build executable"
                                   SPHINX_EXECUTABLE)
-
-# Provide options for controlling different types of output
-option(SPHINX_OUTPUT_HTML "Output standalone HTML files" ON)
-option(SPHINX_OUTPUT_MAN "Output man pages" ON)
-

doc/CMakeLists.txt

@@ -8,31 +8,17 @@
 find_package(Sphinx REQUIRED)
 
 add_custom_target(doc ALL)
+add_custom_command(TARGET doc
+  COMMAND "${SPHINX_EXECUTABLE}" -q
+    -d "${CMAKE_CURRENT_BINARY_DIR}/doctrees"
+    -b html
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_BINARY_DIR}/html"
+  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+  COMMENT "Building HTML documentation with Sphinx"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/html/index.html"
+  )
 
-if (SPHINX_OUTPUT_HTML)
-  add_custom_command(TARGET doc
-    COMMAND ${SPHINX_EXECUTABLE} -q -b html
-      "${CMAKE_CURRENT_SOURCE_DIR}"
-      "${CMAKE_CURRENT_BINARY_DIR}/html"
-    COMMENT "Building HTML documentation with Sphinx"
-    BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/html"
-    )
-
-  install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html"
-    DESTINATION "${DOCDIR}"
-    )
-endif()
-
-if (SPHINX_OUTPUT_MAN)
-  add_custom_command(TARGET doc
-    COMMAND ${SPHINX_EXECUTABLE} -q -b man
-      "${CMAKE_CURRENT_SOURCE_DIR}"
-      "${CMAKE_CURRENT_BINARY_DIR}/man"
-    COMMENT "Building manpage documentation with Sphinx"
-    BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/man"
-    )
-
-  install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/man"
-    DESTINATION "${MANDIR}"
-    )
-endif()
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html/"
+  DESTINATION "${CMAKE_INSTALL_DOCDIR}"
+  )

doc/conf.py

@@ -44,7 +44,7 @@
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = []
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
@@ -88,7 +88,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = []
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.