From 08fd8b6472805d21b77f136b694939a37cf71eb4 Mon Sep 17 00:00:00 2001 From: David Adam Date: Mon, 4 Mar 2019 22:06:07 +0800 Subject: [PATCH] cmake: fix prebuilt documentation detection and installation --- cmake/Docs.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/Docs.cmake b/cmake/Docs.cmake index df43d6972..1f6c30ca8 100644 --- a/cmake/Docs.cmake +++ b/cmake/Docs.cmake @@ -13,8 +13,6 @@ SET(SPHINX_CACHE_DIR "${SPHINX_ROOT_DIR}/doctrees") SET(SPHINX_HTML_DIR "${SPHINX_ROOT_DIR}/html") SET(SPHINX_MANPAGE_DIR "${SPHINX_ROOT_DIR}/man") -CONFIGURE_FILE("${SPHINX_SRC_DIR}/conf.py" "${SPHINX_BUILD_DIR}/conf.py" @ONLY) - ADD_CUSTOM_TARGET(sphinx-docs ${SPHINX_EXECUTABLE} -q -b html @@ -45,7 +43,7 @@ IF(BUILD_DOCS AND NOT SPHINX_EXECUTABLE) ENDIF() IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/user_doc/html - AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/share/man/man1) + AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/user_doc/man) SET(HAVE_PREBUILT_DOCS TRUE) ELSE() SET(HAVE_PREBUILT_DOCS FALSE) @@ -60,6 +58,7 @@ ENDIF() ADD_FEATURE_INFO(Documentation INSTALL_DOCS "user manual and documentation") IF(BUILD_DOCS) + CONFIGURE_FILE("${SPHINX_SRC_DIR}/conf.py" "${SPHINX_BUILD_DIR}/conf.py" @ONLY) ADD_CUSTOM_TARGET(doc ALL DEPENDS sphinx-docs sphinx-manpages)