diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-29 14:35:11 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-29 14:35:11 +0000 |
| commit | 759be64115508e4589c098c5e777d03a1a04bb25 (patch) | |
| tree | 6f55159975fc03114e6c2eecf88a641f3c0fa534 /doc | |
| parent | ece2a2d6c231aa60409a75a2787b349d342b99eb (diff) | |
[trunk] Fix remainings issues with doxygen doc
Convert DOS files to UNIX eol
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | doc/Doxyfile.dox.cmake.in | 16 |
2 files changed, 12 insertions, 11 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 08418db0..d4f3ddbe 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -22,6 +22,12 @@ if(DOXYGEN_FOUND) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jpip_protocol.png ${CMAKE_BINARY_DIR}/doc/html/jpip_protocol.png COPYONLY) + file(GLOB headers + ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/*.h + ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/*.c + ${OPENJPEG_SOURCE_DIR}/src/lib/openjpip/*.h + ${OPENJPEG_SOURCE_DIR}/src/lib/openjpip/*.c + ) # Generate new target to build the html documentation add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/index.html @@ -29,6 +35,7 @@ if(DOXYGEN_FOUND) DEPENDS ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox ${CMAKE_BINARY_DIR}/doc/mainpage.dox ${CMAKE_BINARY_DIR}/doc/openjpip.dox + ${headers} ) add_custom_target(doc ALL DEPENDS ${CMAKE_BINARY_DIR}/doc/html/index.html diff --git a/doc/Doxyfile.dox.cmake.in b/doc/Doxyfile.dox.cmake.in index 702a8f58..548c2012 100644 --- a/doc/Doxyfile.dox.cmake.in +++ b/doc/Doxyfile.dox.cmake.in @@ -1,4 +1,4 @@ -# Doxyfile 1.7.3 +# Doxyfile 1.7.1 #--------------------------------------------------------------------------- # Project related configuration options @@ -6,8 +6,6 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = OpenJPEG PROJECT_NUMBER = @OPENJPEG_VERSION@ -PROJECT_BRIEF = -PROJECT_LOGO = OUTPUT_DIRECTORY = @OPENJPEG_BINARY_DIR@/doc CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -74,7 +72,6 @@ SORT_BRIEF_DOCS = NO SORT_MEMBERS_CTORS_1ST = NO SORT_GROUP_NAMES = NO SORT_BY_SCOPE_NAME = NO -STRICT_PROTO_MATCHING = NO GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES @@ -100,7 +97,8 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = @OPENJPEG_SOURCE_DIR@/src/lib \ +INPUT = @OPENJPEG_SOURCE_DIR@/src/lib/openjp2 \ + @OPENJPEG_SOURCE_DIR@/src/lib/openjpip \ @OPENJPEG_BINARY_DIR@/doc INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.h \ @@ -109,16 +107,15 @@ FILE_PATTERNS = *.h \ RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = .svn +EXCLUDE_PATTERNS = */.svn/* EXCLUDE_SYMBOLS = EXAMPLE_PATH = EXAMPLE_PATTERNS = * EXAMPLE_RECURSIVE = NO -IMAGE_PATH = +IMAGE_PATH = @OPENJPEG_SOURCE_DIR@/doc INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO -FILTER_SOURCE_PATTERNS = #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- @@ -181,8 +178,6 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES -USE_MATHJAX = NO -MATHJAX_RELPATH = http://www.mathjax.org/mathjax SEARCHENGINE = NO SERVER_BASED_SEARCH = NO #--------------------------------------------------------------------------- @@ -282,7 +277,6 @@ DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = -MSCFILE_DIRS = DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO |