From fc5bbbd4c1796fb0f88e8ce3f6c9cbdecc7579f8 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 7 Oct 2019 11:43:32 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=80=D1=8F=D0=B4=D0=BE=D0=BA=20?= =?UTF-8?q?=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D0=B0=D1=80=D0=B3=D1=83=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibDocBreathe.cmake | 10 +++++----- CMLibDocDoxygen.cmake | 13 ++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/CMLibDocBreathe.cmake b/CMLibDocBreathe.cmake index 991d2ec..75b90f1 100644 --- a/CMLibDocBreathe.cmake +++ b/CMLibDocBreathe.cmake @@ -21,12 +21,12 @@ endif() function(add_breathe_target) - if(BREATHE_FOUND) - set(options) - set(oneValueArgs SOURCE_DIR BUILD_DIR CACHE_DIR HTML_DIR DOXY_FILE CONF_FILE TARGET_NAME COMMENT) - set(multiValueArgs) + set(options) + set(oneValueArgs SOURCE_DIR BUILD_DIR CACHE_DIR HTML_DIR DOXY_FILE CONF_FILE TARGET_NAME COMMENT) + set(multiValueArgs) - cmake_parse_arguments(_BREATHE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments(_BREATHE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + if(BREATHE_FOUND) set(BREATHE_DOCS_BUILD_DIR ${_BREATHE_BUILD_DIR}) set(GENERATE_XML YES) set(GENERATE_HTML NO) diff --git a/CMLibDocDoxygen.cmake b/CMLibDocDoxygen.cmake index e9e56cf..0cc5d3b 100644 --- a/CMLibDocDoxygen.cmake +++ b/CMLibDocDoxygen.cmake @@ -10,12 +10,12 @@ endif() function(add_doxygen_target) - if (DOXYGEN_FOUND) - set(options) - set(oneValueArgs TARGET_NAME DOXY_FILE OUTPUT_DIRECTORY LATEX HTML) - set(multiValueArgs) + set(options) + set(oneValueArgs TARGET_NAME DOXY_FILE OUTPUT_DIRECTORY LATEX HTML) + set(multiValueArgs) - cmake_parse_arguments(_DOXYGEN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + cmake_parse_arguments(_DOXYGEN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + if (DOXYGEN_FOUND) set(GENERATE_XML NO) set(GENERATE_HTML NO) set(GENERATE_LATEX NO) @@ -32,8 +32,7 @@ function(add_doxygen_target) add_custom_target(${_DOXYGEN_TARGET_NAME} VERBATIM COMMAND ${DOXYGEN_EXECUTABLE} ${_DOXYGEN_OUTPUT_DIRECTORY}/Doxyfile WORKING_DIRECTORY ${_DOXYGEN_OUTPUT_DIRECTORY} - COMMENT "Generating API documentation with Doxygen" - VERBATIM) + COMMENT "Generating API documentation with Doxygen") else() add_custom_target(${_DOXYGEN_TARGET_NAME} VERBATIM COMMENT "Doxygen is not found. Skipping target ${_DOXYGEN_TARGET_NAME} build")