From b22364f4af3564f0dd9a5f4e150bb09747bd5c4e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 1 Aug 2014 22:32:07 +0200 Subject: Fix CMake warning about doc target, only use `doxygen' target Also, to avoid conflicts with the doc directory, the default output dir has been changed to doxygen. --- cmake/UseDoxygen.cmake | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'cmake') diff --git a/cmake/UseDoxygen.cmake b/cmake/UseDoxygen.cmake index 245ba56..ae7c8d7 100644 --- a/cmake/UseDoxygen.cmake +++ b/cmake/UseDoxygen.cmake @@ -32,7 +32,7 @@ # "${CMAKE_CURRENT_BINARY_DIR}/foo.c" "${CMAKE_CURRENT_BINARY_DIR}/bar/" # # DOXYFILE_OUTPUT_DIR - Path where the Doxygen output is stored. -# Defaults to "${CMAKE_CURRENT_BINARY_DIR}/doc". +# Defaults to "${CMAKE_CURRENT_BINARY_DIR}/doxygen". # # DOXYFILE_LATEX - ON/OFF; Set to "ON" if you want the LaTeX documentation # to be built. @@ -70,7 +70,7 @@ if(DOXYGEN_FOUND) endif() if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND) - usedoxygen_set_default(DOXYFILE_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc" + usedoxygen_set_default(DOXYFILE_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doxygen" PATH "Doxygen output directory") usedoxygen_set_default(DOXYFILE_HTML_DIR "html" STRING "Doxygen HTML output directory") @@ -134,11 +134,4 @@ if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND) configure_file("${DOXYFILE_IN}" "${DOXYFILE}" @ONLY) - - get_target_property(DOC_TARGET doc TYPE) - if(NOT DOC_TARGET) - add_custom_target(doc) - endif() - - add_dependencies(doc doxygen) endif() -- cgit v1.2.3