Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 15, 2009, 7:53:22 PM (16 years ago)
Author:
rgrieder
Message:
  • Added version info (written by the linker) to all libraries
  • Target dependency bugfix for msvc in doc/api
  • Fixed possibly non existent html directory when installing docs
  • Merged the three Bullet libraries into a single one
  • No warnings at all from third party libraries
  • Performance tweak in ceguilua CMake files
File:
1 edited

Legend:

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

    r2664 r2670  
    6565      STRING(REGEX REPLACE "/" "\\\\" HHP_FILE ${TMP})
    6666      ADD_CUSTOM_TARGET(chmdoc ${HTML_HELP_COMPILER} ${HHP_FILE})
    67       IF(NOT MSVC)
    68         ADD_DEPENDENCIES(chmdoc doc)
    69       ELSE(NOT MSVC)
    70         # Do not add the dependency because msvc will then always build
    71         # Doxygen, which is not very comforting.
    72       ENDIF(NOT MSVC)
     67      ADD_DEPENDENCIES(chmdoc doc)
     68      # Adding a dependency somehow adds doc target as default build target
     69      SET_TARGET_PROPERTIES(doc chmdoc PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
    7370    ENDIF(HTML_HELP_COMPILER)
    7471  ENDIF (WIN32)
     
    8178    OPTIONAL
    8279  )
    83   IF(EXISTS ${CMAAKE_CURRENT_BINARY_DIR}/html)
    84     INSTALL(
    85       DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
    86       DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
    87     )
     80  # Install command always needs the directory to work
     81  IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/html)
     82    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html)
    8883  ENDIF()
     84  INSTALL(
     85    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
     86    DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
     87  )
    8988ENDIF(DOXYGEN_FOUND)
Note: See TracChangeset for help on using the changeset viewer.