Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3171


Ignore:
Timestamp:
Jun 14, 2009, 8:31:17 PM (15 years ago)
Author:
rgrieder
Message:

Merged Gruppenarbeit changes regarding Doxygen: Don't worry, I haven't actually changed any Doxygen option, just a little clean up.

Location:
code/branches/pch/doc/api
Files:
2 added
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • code/branches/pch/doc/api/CMakeLists.txt

    r2710 r3171  
    5050    # use (configured) doxy.config from (out of place) BUILD tree:
    5151    SET(DOXY_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/doxy.config)
     52    SET(DOXY_LOGFILE ${CMAKE_CURRENT_BINARY_DIR}/doxy.log)
    5253  ELSE()
    53     MESSAGE(STATUS "Warning: Could not find dox.config.in in the root directory.")
     54    MESSAGE(FATAL_ERROR "Warning: Could not find dox.config.in in the root directory.")
    5455  ENDIF()
    5556 
     
    6465      SET(TMP ${DOXY_OUTPUT_DIR}/html/index.hhp)
    6566      STRING(REGEX REPLACE "/" "\\\\" HHP_FILE ${TMP})
    66       ADD_CUSTOM_TARGET(chmdoc ${HTML_HELP_COMPILER} ${HHP_FILE})
    67       ADD_DEPENDENCIES(chmdoc doc)
     67      ADD_CUSTOM_TARGET(doc_chm ${HTML_HELP_COMPILER} ${HHP_FILE})
     68      ADD_DEPENDENCIES(doc_chm doc)
    6869      # Adding a dependency somehow adds doc target as default build target
    69       SET_TARGET_PROPERTIES(doc chmdoc PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
     70      SET_TARGET_PROPERTIES(doc doc_chm PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
    7071    ENDIF(HTML_HELP_COMPILER)
    7172  ENDIF (WIN32)
     
    7879    OPTIONAL
    7980  )
    80   # Install command always needs the directory to work
     81  # Install command always needs the directory
    8182  IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/html)
    8283    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html)
  • code/branches/pch/doc/api/doxy.config.in

    r2891 r3171  
    5353
    5454OUTPUT_LANGUAGE        = English
    55 
    56 # This tag can be used to specify the encoding used in the generated output.
    57 # The encoding is not always determined by the language that is chosen,
    58 # but also whether or not the output is meant for Windows or non-Windows users.
    59 # In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
    60 # forces the Windows encoding (this is the default for the Windows binary),
    61 # whereas setting the tag to NO uses a Unix-style encoding (the default for
    62 # all platforms other than Windows).
    63 
    64 USE_WINDOWS_ENCODING   = YES
    6555
    6656# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
     
    377367# documentation sections, marked by \if sectionname ... \endif.
    378368
    379 ENABLED_SECTIONS       =
     369ENABLED_SECTIONS       = YES
    380370
    381371# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
     
    401391SHOW_DIRECTORIES       = YES
    402392
     393# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
     394# This will remove the Files entry from the Quick Index and from the Folder
     395# Tree View (if specified). The default is YES.
     396
     397SHOW_FILES             = YES
     398
     399# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
     400# Namespaces page. This will remove the Namespaces entry from the Quick Index
     401# and from the Folder Tree View (if specified). The default is YES.
     402
     403SHOW_NAMESPACES        = YES
     404
    403405# The FILE_VERSION_FILTER tag can be used to specify a program or script that
    404406# doxygen should invoke to get the current version for each file (typically from the
     
    460462# to stderr.
    461463
    462 WARN_LOGFILE           = @DOXY_OUTPUT_DIR@/doxy.log
     464WARN_LOGFILE           = @DOXY_LOGFILE@
    463465
    464466#---------------------------------------------------------------------------
     
    472474
    473475INPUT                  = @CMAKE_SOURCE_DIR@/src \
     476                         @CMAKE_CURRENT_SOURCE_DIR@ \
    474477                         @CMAKE_BINARY_DIR@/src
    475478
     
    518521# the \include command).
    519522
    520 EXAMPLE_PATH           = @CMAKE_SOURCE_DIR@/doc/examples/
     523EXAMPLE_PATH           = @CMAKE_CURRENT_SOURCE_DIR@/examples/
    521524
    522525# If the value of the EXAMPLE_PATH tag contains directories, you can use the
     
    542545# the \image command).
    543546
    544 IMAGE_PATH             = @CMAKE_SOURCE_DIR@/doc/images/
     547IMAGE_PATH             = @CMAKE_CURRENT_SOURCE_DIR@/images/
    545548
    546549
     
    10301033# instead of the = operator.
    10311034
    1032 PREDEFINED             =
     1035PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS
    10331036
    10341037# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
     
    11401143
    11411144UML_LOOK               = NO
    1142 # UML_LOOK               = YES
    11431145
    11441146# If set to YES, the inheritance and collaboration graphs will show the
     
    11961198# \dotfile command).
    11971199
    1198 DOTFILE_DIRS           =
     1200DOTFILE_DIRS           = @CMAKE_CURRENT_SOURCE_DIR@/dot
    11991201
    12001202# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
     
    12221224# makes dot run faster, but since only newer versions of dot (>1.8.10)
    12231225# support this, this feature is disabled by default.
    1224 # JW
    1225 # DOT_MULTI_TARGETS      = NO
     1226
    12261227DOT_MULTI_TARGETS      = NO
    12271228
     
    12451246# used. If set to NO the values of all tags below this one will be ignored.
    12461247
    1247 # JW SEARCHENGINE           = NO
    12481248SEARCHENGINE           = YES
Note: See TracChangeset for help on using the changeset viewer.