From dfdf4323434ec466613e9c358da98a4be868986c Mon Sep 17 00:00:00 2001 From: albert-github Date: Fri, 7 Dec 2018 13:30:20 +0100 Subject: Correcting tag example and uniform calling all examples - tag example corrected in respect to changed definition (a while ago) regarding the name of the Example example - regenerating tag file (based on current doxygen version) - made building of all examples uniform --- examples/CMakeLists.txt | 6 ++++-- examples/example.cfg | 2 +- examples/example.tag | 14 -------------- examples/tag.cfg | 4 +++- examples/tag.cpp | 2 +- examples/templ.cfg | 4 +++- 6 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 examples/example.tag diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 601ed5a..0f34c6d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -163,8 +163,9 @@ add_custom_command( add_custom_command( COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen tag.cfg + COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman_doc.tex DEPENDS doxygen tag.cpp tag.cfg ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html ${TOP}/examples/strip_example.py - OUTPUT ${PROJECT_BINARY_DIR}/html/examples/tag/html/index.html + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/tag/html/index.html ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman_doc.tex ) add_custom_command( @@ -183,8 +184,9 @@ add_custom_command( add_custom_command( COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen templ.cfg + COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman_doc.tex DEPENDS doxygen templ.cpp templ.cfg ${TOP}/examples/strip_example.py - OUTPUT ${PROJECT_BINARY_DIR}/html/examples/template/html/index.html + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/template/html/index.html ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman_doc.tex ) add_custom_command( diff --git a/examples/example.cfg b/examples/example.cfg index c55c6b9..22266d4 100644 --- a/examples/example.cfg +++ b/examples/example.cfg @@ -1,6 +1,6 @@ PROJECT_NAME = "Example Command" OUTPUT_DIRECTORY = ../html/examples/example -#GENERATE_TAGFILE = example.tag +GENERATE_TAGFILE = example.tag GENERATE_LATEX = YES GENERATE_MAN = NO GENERATE_RTF = NO diff --git a/examples/example.tag b/examples/example.tag deleted file mode 100644 index 98b2efd..0000000 --- a/examples/example.tag +++ /dev/null @@ -1,14 +0,0 @@ - - - - Test - class_test.html - - void - example - class_test.html - a47b775f65718978f1ffcd96376f8ecfa - () - - - diff --git a/examples/tag.cfg b/examples/tag.cfg index 97d7d2f..823b5a7 100644 --- a/examples/tag.cfg +++ b/examples/tag.cfg @@ -1,6 +1,6 @@ PROJECT_NAME = "Tag Files" OUTPUT_DIRECTORY = ../html/examples/tag -GENERATE_LATEX = NO +GENERATE_LATEX = YES GENERATE_MAN = NO GENERATE_RTF = NO CASE_SENSE_NAMES = NO @@ -10,3 +10,5 @@ PERL_PATH = perl QUIET = YES JAVADOC_AUTOBRIEF = YES SEARCHENGINE = NO +COMPACT_LATEX = YES +LATEX_HIDE_INDICES = YES diff --git a/examples/tag.cpp b/examples/tag.cpp index 6497dd4..74435c1 100644 --- a/examples/tag.cpp +++ b/examples/tag.cpp @@ -1,7 +1,7 @@ /*! A class that is inherited from the external class Test. */ -class Tag : public Test +class Tag : public Example_Test { public: /*! an overloaded member. */ diff --git a/examples/templ.cfg b/examples/templ.cfg index eb59559..9d42e79 100644 --- a/examples/templ.cfg +++ b/examples/templ.cfg @@ -1,6 +1,6 @@ PROJECT_NAME = "Template Test" OUTPUT_DIRECTORY = ../html/examples/template -GENERATE_LATEX = NO +GENERATE_LATEX = YES GENERATE_MAN = NO GENERATE_RTF = NO CASE_SENSE_NAMES = NO @@ -8,3 +8,5 @@ INPUT = templ.cpp QUIET = YES JAVADOC_AUTOBRIEF = YES SEARCHENGINE = NO +COMPACT_LATEX = YES +LATEX_HIDE_INDICES = YES -- cgit v0.12