Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2657


Ignore:
Timestamp:
Feb 14, 2009, 4:47:13 PM (16 years ago)
Author:
rgrieder
Message:
  • Added install paths for bin, lib, archive, media, doc, config and log (config and log yet unused).
  • Install target for doxygen apidoc
  • Configured CMake to adjust the RPath in the installed executable. This should make the game find usr/lib/orxonox/lib…so when installed.
Location:
code/branches/buildsystem2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem2/bin/CMakeLists.txt

    r2644 r2657  
    9999  IF(CMAKE_CONFIGURATION_TYPES)
    100100    FOREACH(_configuration ${CMAKE_CONFIGURATION_TYPES})
    101       INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${_configuration}/${_file}
    102               DESTINATION bin CONFIGURATIONS ${_configuration})
     101      INSTALL(
     102        FILES ${CMAKE_BINARY_DIR}/bin/${_configuration}/${_file}
     103        DESTINATION ${ORXONOX_RUNTIME_INSTALL_PATH}
     104        CONFIGURATIONS ${_configuration}
     105      )
    103106    ENDFOREACH(_configuration)
    104107  ELSE()
  • code/branches/buildsystem2/cmake/BuildConfig.cmake

    r2650 r2657  
    110110
    111111
     112############ Installation Settings ##############
     113
     114IF(UNIX)
     115  SET(ORXONOX_RUNTIME_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/bin/orxonox)
     116  SET(ORXONOX_LIBRARY_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/orxonox)
     117  SET(ORXONOX_ARCHIVE_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/orxonox/static)
     118  SET(ORXONOX_MEDIA_INSTALL_PATH   ${CMAKE_INSTALL_PREFIX}/share/orxonox)
     119  SET(ORXONOX_DOC_INSTALL_PATH     ${CMAKE_INSTALL_PREFIX}/share/doc/orxonox)
     120  # Not yet used
     121  SET(ORXONOX_LOG_INSTALL_PATH     ~/.orxonox/log)
     122  SET(ORXONOX_CONFIG_INSTALL_PATH  ~/.orxonox/config)
     123ELSEIF(WIN32)
     124  SET(ORXONOX_RUNTIME_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/bin)
     125  SET(ORXONOX_LIBRARY_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib)
     126  SET(ORXONOX_ARCHIVE_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/static)
     127  SET(ORXONOX_MEDIA_INSTALL_PATH   ${CMAKE_INSTALL_PREFIX}/media)
     128  SET(ORXONOX_DOC_INSTALL_PATH     ${CMAKE_INSTALL_PREFIX}/doc)
     129  # Not yet used
     130  SET(ORXONOX_LOG_INSTALL_PATH     ${CMAKE_INSTALL_PREFIX}/log)
     131  SET(ORXONOX_CONFIG_INSTALL_PATH  ${CMAKE_INSTALL_PREFIX}/config)
     132ENDIF()
     133
     134
     135################# Unix RPath ####################
     136
     137# use, i.e. don't skip the full RPATH for the build tree
     138SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
     139
     140# when building, don't use the install RPATH already
     141# (but later on when installing)
     142SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
     143
     144# the RPATH to be used when installing
     145SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
     146
     147# add the automatically determined parts of the RPATH
     148# which point to directories outside the build tree to the install RPATH
     149SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
     150
     151
    112152####### Static/Dynamic linking defines ##########
    113153
  • code/branches/buildsystem2/cmake/InstallUtilities.cmake

    r2651 r2657  
    2828FUNCTION(ORXONOX_INSTALL)
    2929  INSTALL(TARGETS ${ARGN}
    30     RUNTIME DESTINATION bin
    31     LIBRARY DESTINATION lib
    32     #ARCHIVE DESTINATION lib
     30    RUNTIME DESTINATION ${ORXONOX_RUNTIME_INSTALL_PATH}
     31    LIBRARY DESTINATION ${ORXONOX_LIBRARY_INSTALL_PATH}
     32    #ARCHIVE DESTINATION ${ORXONOX_ARCHIVE_INSTALL_PATH}
    3333  )
    3434ENDFUNCTION(ORXONOX_INSTALL)
  • code/branches/buildsystem2/doc/api/CMakeLists.txt

    r2656 r2657  
    7373    ENDIF(HTML_HELP_COMPILER)
    7474  ENDIF (WIN32)
     75
     76
     77  # Installation
     78  INSTALL(
     79    FILES ${DOXY_CONFIG} ${CMAKE_CURRENT_BINARY_DIR}/doxy.log
     80    DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
     81    OPTIONAL
     82  )
     83  INSTALL(
     84    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
     85    DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
     86  )
    7587ENDIF(DOXYGEN_FOUND)
  • code/branches/buildsystem2/media/CMakeLists.txt

    r2654 r2657  
    4040################ Installation #################
    4141
    42 IF(UNIX)
    43   SET(MEDIA_INSTALL_SUFFIX "share/orxonox")
    44 ELSEIF(WIN32)
    45   SET(MEDIA_INSTALL_SUFFIX "media")
    46 ELSE()
    47   MESSAGE(FATAL_ERROR "Install location for media files not yet specified for this platform. Please Adjust root/media/CMakeLists.txt")
    48 ENDIF()
    49 
    50 INSTALL(DIRECTORY ${ORXONOX_MEDIA_DIRECTORY}/ DESTINATION
    51         ${MEDIA_INSTALL_SUFFIX} REGEX "\\.svn$|_svn$" EXCLUDE)
     42INSTALL(
     43  DIRECTORY ${ORXONOX_MEDIA_DIRECTORY}/
     44  DESTINATION ${ORXONOX_MEDIA_INSTALL_PATH}
     45  REGEX "\\.svn$|_svn$" EXCLUDE
     46)
Note: See TracChangeset for help on using the changeset viewer.