Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2656


Ignore:
Timestamp:
Feb 14, 2009, 4:43:16 PM (15 years ago)
Author:
rgrieder
Message:

Moved doxygen to doc/api and adjusted some values in the doxy config.

Location:
code/branches/buildsystem2
Files:
3 added
1 edited
2 moved

Legend:

Unmodified
Added
Removed

  • code/branches/buildsystem2/CMakeLists.txt

    r2644 r2656  
    5252
    5353# Last but not least: Try to make doxygen target
    54 INCLUDE(DocumentationTarget)
     54ADD_SUBDIRECTORY(doc)

  • code/branches/buildsystem2/doc/api/CMakeLists.txt

    r2653 r2656  
    1 # -helper macro to add a "doc" target with CMake build system.
    2 # and configure doxy.config.in to doxy.config
     1# Add a "doc" target with CMake build system.
     2# And configure doxy.config.in to doxy.config
    33#
    44# target "doc" allows building the documentation with doxygen/dot on WIN32 and Linux
    … …  
    2929    SET(DOXY_WARN_FORMAT "\"$file:$line: $text \"")
    3030  ENDIF()
     31
     32  SET(DOXY_INPUT_DIR  ${CMAKE_CURRENT_SOURCE_DIR})
     33  SET(DOXY_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
    3134 
    3235  # we need latex for doxygen because of the formulas
    … …  
    4346  #ENDIF (NOT DVIPS_CONVERTER)
    4447 
    45   IF(EXISTS ${CMAKE_SOURCE_DIR}/doxy.config.in)
    46     CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/doxy.config.in ${CMAKE_BINARY_DIR}/doxy.config @ONLY)
     48  IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in)
     49    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in ${CMAKE_CURRENT_BINARY_DIR}/doxy.config @ONLY)
    4750    # use (configured) doxy.config from (out of place) BUILD tree:
    48     SET(DOXY_CONFIG ${CMAKE_BINARY_DIR}/doxy.config)
     51    SET(DOXY_CONFIG ${CMAKE_CURRENT_BINARY_DIR}/doxy.config)
    4952  ELSE()
    5053    MESSAGE(STATUS "Warning: Could not find dox.config.in in the root directory.")
    … …  
    5962    FIND_PACKAGE(HTMLHelp)
    6063    IF(HTML_HELP_COMPILER)     
    61       SET(TMP ${CMAKE_CURRENT_BINARY_DIR}/doc/html/index.hhp)
     64      SET(TMP ${DOXY_OUTPUT_DIR}/html/index.hhp)
    6265      STRING(REGEX REPLACE "/" "\\\\" HHP_FILE ${TMP})
    6366      ADD_CUSTOM_TARGET(chmdoc ${HTML_HELP_COMPILER} ${HHP_FILE})

  • code/branches/buildsystem2/doc/api/doxy.config.in

    r2653 r2656  
    3131# where doxygen was started. If left blank the current directory will be used.
    3232
    33 OUTPUT_DIRECTORY       = doc
     33OUTPUT_DIRECTORY       = @DOXY_OUTPUT_DIR@
    3434
    3535# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
    … …  
    116116# path to strip.
    117117
    118 STRIP_FROM_PATH        = @CMAKE_CURRENT_SOURCE_DIR@
     118STRIP_FROM_PATH        = @CMAKE_SOURCE_DIR@
    119119
    120120
    … …  
    126126# are normally passed to the compiler using the -I flag.
    127127
    128 STRIP_FROM_INC_PATH    = @CMAKE_CURRENT_SOURCE_DIR@/
     128STRIP_FROM_INC_PATH    = @CMAKE_SOURCE_DIR@
    129129
    130130# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
    … …  
    450450# to stderr.
    451451
    452 WARN_LOGFILE           = doc/doxy.log
     452WARN_LOGFILE           = @DOXY_OUTPUT_DIR@/doxy.log
    453453
    454454#---------------------------------------------------------------------------
    … …  
    462462
    463463INPUT                  = @CMAKE_SOURCE_DIR@/src \
    464                          @CMAKE_CURRENT_BINARY_DIR@/src
     464                         @CMAKE_BINARY_DIR@/src
    465465
    466466# If the value of the INPUT tag contains directories, you can use the
    … …  
    508508# the \include command).
    509509
    510 EXAMPLE_PATH           = @CMAKE_CURRENT_SOURCE_DIR@/Base/Common/Examples \
    511                          @CMAKE_CURRENT_SOURCE_DIR@/Base/Debug/Examples \
    512                          @CMAKE_CURRENT_SOURCE_DIR@/Base/Math/Examples \
    513                          @CMAKE_CURRENT_SOURCE_DIR@/Base/Image/Examples \
    514                          @CMAKE_CURRENT_SOURCE_DIR@/Base/Geometry/Examples \
    515                          @CMAKE_CURRENT_SOURCE_DIR@/MathAlgo/Examples \
    516                          @CMAKE_CURRENT_SOURCE_DIR@/Geometry/Examples \
    517                          @CMAKE_CURRENT_SOURCE_DIR@/CornerDetector/Examples \
    518                          @CMAKE_CURRENT_SOURCE_DIR@/Image/Examples \
    519                          @CMAKE_CURRENT_SOURCE_DIR@/StateEstimator/Examples \
    520                          @CMAKE_CURRENT_SOURCE_DIR@/Matcher2D/Examples \
    521                          @CMAKE_CURRENT_SOURCE_DIR@/Utils/Examples \
    522                          @CMAKE_CURRENT_SOURCE_DIR@/Gui/Examples \
    523                          @CMAKE_CURRENT_SOURCE_DIR@/FeatureDetector/Examples \
    524                          @CMAKE_CURRENT_SOURCE_DIR@/doc \
    525                          @CMAKE_CURRENT_SOURCE_DIR@
     510EXAMPLE_PATH           = @DOXY_INPUT_DIR@
    526511
    527512# If the value of the EXAMPLE_PATH tag contains directories, you can use the
    … …  
    547532# the \image command).
    548533
    549 IMAGE_PATH             = @CMAKE_CURRENT_SOURCE_DIR@/doc \
    550                                                  @CMAKE_CURRENT_SOURCE_DIR@/Tests/data \
    551                                                  @CMAKE_CURRENT_SOURCE_DIR@
     534IMAGE_PATH             = @DOXY_INPUT_DIR@
    552535
    553536
    … …  
    10781061# a tag file that is based on the input files it reads.
    10791062
    1080 GENERATE_TAGFILE       = doc/html/@PROJECT_NAME@.TAGFILE
     1063GENERATE_TAGFILE       = @DOXY_OUTPUT_DIR@/html/@PROJECT_NAME@.TAGFILE
    10811064
    10821065# If the ALLEXTERNALS tag is set to YES all external classes will be listed
Note: See TracChangeset for help on using the changeset viewer.