From 3c1b14e6cb49e8a8129ada92e87d40a83b5f4ebe Mon Sep 17 00:00:00 2001 From: Erik Boasson Date: Wed, 6 May 2020 09:57:56 +0200 Subject: [PATCH] Fix paths in documentation generation Signed-off-by: Erik Boasson --- cmake/Modules/FindSphinx.cmake | 2 +- docs/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/FindSphinx.cmake b/cmake/Modules/FindSphinx.cmake index 70ddc89..1c01586 100644 --- a/cmake/Modules/FindSphinx.cmake +++ b/cmake/Modules/FindSphinx.cmake @@ -319,7 +319,7 @@ function(sphinx_add_docs _target) endif() add_custom_target( - ${_target} + ${_target} ALL COMMAND ${SPHINX_BUILD_EXECUTABLE} -b ${_builder} -d "${CMAKE_CURRENT_BINARY_DIR}/${_target}.cache/_doctrees" diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 82fe266..07cc5bf 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -46,11 +46,11 @@ if(BUILD_DOCS) docs BREATHE_PROJECTS ddsc_api_docs BUILDER html - SOURCE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + SOURCE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/manual") add_dependencies(docs options_doc) install( - DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/docs" DESTINATION "${CMAKE_INSTALL_DOCDIR}/manual" COMPONENT dev) endif()