mirror of
https://github.com/Fishwaldo/open-zwave.git
synced 2025-03-15 19:41:36 +00:00
Fix Dot Detection from issue 350 - Now disable dot directly in the Doxygen Config file. This fixes issue 411
This commit is contained in:
parent
6b00d411cf
commit
f6f20cec1a
2 changed files with 10 additions and 8 deletions
|
@ -142,19 +142,21 @@ $(top_builddir)/libopenzwave.pc: $(top_srcdir)/cpp/build/libopenzwave.pc.in $(PK
|
|||
-e 's|[@]VERSION@|$(VERSION)|g' \
|
||||
< "$<" > "$@"
|
||||
endif
|
||||
ifeq ($(DOT),)
|
||||
HAVE_DOT = -e 's|[@]HAVE_DOT@|NO|g'
|
||||
else
|
||||
HAVE_DOT = -e 's|[@]HAVE_DOT@|YES|g'
|
||||
endif
|
||||
|
||||
$(top_builddir)/Doxyfile: $(top_srcdir)/docs/Doxyfile.in
|
||||
$(top_builddir)/Doxyfile: $(top_srcdir)/docs/Doxyfile.in $(top_srcdir)/cpp/src/vers.cpp
|
||||
@mkdir -p $(top_builddir)/docs/api/
|
||||
@$(SED) \
|
||||
-e 's|[@]OUTPUT_DIR@|$(top_builddir)/docs/api/|g' \
|
||||
-e 's|[@]TOPSRC_DIR@|$(top_srcdir)|g' \
|
||||
$(HAVE_DOT) \
|
||||
-e 's|[@]VERSION@|$(VERSION).$(VERSION_REV)|g' \
|
||||
< "$<" > "$@"
|
||||
|
||||
# If we dont have DOT, we will fail building doxygen
|
||||
ifeq ($(DOT),)
|
||||
undefine DOXYGEN
|
||||
endif
|
||||
|
||||
ifeq ($(DOXYGEN),)
|
||||
doc:
|
||||
$(warning Documentation not being built)
|
||||
|
|
|
@ -38,7 +38,7 @@ PROJECT_NAME = "OpenZWave Library"
|
|||
# could be handy for archiving the generated documentation or if some version
|
||||
# control system is used.
|
||||
|
||||
PROJECT_NUMBER = 1.2
|
||||
PROJECT_NUMBER = @VERSION@
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||
# for a project that appears at the top of each page and should give viewer a
|
||||
|
@ -2032,7 +2032,7 @@ HIDE_UNDOC_RELATIONS = YES
|
|||
# set to NO
|
||||
# The default value is: NO.
|
||||
|
||||
HAVE_DOT = YES
|
||||
HAVE_DOT = @HAVE_DOT@
|
||||
|
||||
# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
|
||||
# to run in parallel. When set to 0 doxygen will base this on the number of
|
||||
|
|
Loading…
Add table
Reference in a new issue