summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2014-08-01 22:32:07 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2014-08-01 22:32:07 +0200
commitb22364f4af3564f0dd9a5f4e150bb09747bd5c4e (patch)
treea60da70e46bec3a5fb14e2f110609f661d9022e4
parent5f385b0ea01865834214dae79afa557f37f9c275 (diff)
downloadfastd-b22364f4af3564f0dd9a5f4e150bb09747bd5c4e.tar
fastd-b22364f4af3564f0dd9a5f4e150bb09747bd5c4e.zip
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.
-rw-r--r--cmake/UseDoxygen.cmake11
1 files changed, 2 insertions, 9 deletions
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()