From f630318d674b4bb0e379329f34228a4aedd98032 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sat, 5 Oct 2019 16:39:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D1=86?= =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=B9=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibDocBreathe.cmake | 1 + CMLibDocDoxygen.cmake | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMLibDocBreathe.cmake b/CMLibDocBreathe.cmake index 82068dc..991d2ec 100644 --- a/CMLibDocBreathe.cmake +++ b/CMLibDocBreathe.cmake @@ -31,6 +31,7 @@ function(add_breathe_target) set(GENERATE_XML YES) set(GENERATE_HTML NO) set(GENERATE_LATEX NO) + set(OUTPUT_DIRECTORY ${_BREATHE_HTML_DIR}) configure_file(${_BREATHE_CONF_FILE} ${_BREATHE_BUILD_DIR}/conf.py @ONLY) configure_file(${_BREATHE_DOXY_FILE} ${_BREATHE_BUILD_DIR}/Doxyfile @ONLY) diff --git a/CMLibDocDoxygen.cmake b/CMLibDocDoxygen.cmake index 0f428a0..e9e56cf 100644 --- a/CMLibDocDoxygen.cmake +++ b/CMLibDocDoxygen.cmake @@ -12,7 +12,7 @@ endif() function(add_doxygen_target) if (DOXYGEN_FOUND) set(options) - set(oneValueArgs TARGET_NAME IN OUT LATEX HTML) + set(oneValueArgs TARGET_NAME DOXY_FILE OUTPUT_DIRECTORY LATEX HTML) set(multiValueArgs) cmake_parse_arguments(_DOXYGEN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) @@ -26,16 +26,16 @@ function(add_doxygen_target) set(GENERATE_LATEX YES) endif() - configure_file(${_DOXYGEN_IN} ${_DOXYGEN_OUT} @ONLY) + configure_file(${_DOXYGEN_DOXY_FILE} ${_DOXYGEN_OUTPUT_DIRECTORY}/Doxyfile @ONLY) message("Doxygen build started") add_custom_target(${_DOXYGEN_TARGET_NAME} VERBATIM - COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${DOXYGEN_EXECUTABLE} ${_DOXYGEN_OUTPUT_DIRECTORY}/Doxyfile + WORKING_DIRECTORY ${_DOXYGEN_OUTPUT_DIRECTORY} COMMENT "Generating API documentation with Doxygen" VERBATIM) else() add_custom_target(${_DOXYGEN_TARGET_NAME} VERBATIM - COMMENT "Doxygen is not found. Skipping target ${_BREATHE_TARGET_NAME} build") + COMMENT "Doxygen is not found. Skipping target ${_DOXYGEN_TARGET_NAME} build") endif() endfunction()