Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 31, 2009, 4:25:09 PM (15 years ago)
Author:
landauf
Message:

added CMakeLists, compiles now

Location:
code/branches/libraries2/src
Files:
3 added
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/libraries2/src/CMakeLists.txt

    r5695 r5716  
    7272  ${CMAKE_CURRENT_SOURCE_DIR}
    7373  # Bullet headers really need the include directory
    74   ${CMAKE_CURRENT_SOURCE_DIR}/bullet
     74  ${CMAKE_CURRENT_SOURCE_DIR}/external/bullet
    7575  # OIS headers need the root dir as well
    76   ${CMAKE_CURRENT_SOURCE_DIR}/ois
    77   # Convenience directory
    78   ${CMAKE_CURRENT_SOURCE_DIR}/orxonox
     76  ${CMAKE_CURRENT_SOURCE_DIR}/external/ois
    7977  # OrxonoxConfig.h
    8078  ${CMAKE_CURRENT_BINARY_DIR}
    8179  # Tolua bind files for Core
    82   ${CMAKE_CURRENT_BINARY_DIR}/core/${CMAKE_CFG_INTDIR}
     80  ${CMAKE_CURRENT_BINARY_DIR}/libraries/core/${CMAKE_CFG_INTDIR}
    8381  # Tolua bind files for Orxonox
    8482  ${CMAKE_CURRENT_BINARY_DIR}/orxonox/${CMAKE_CFG_INTDIR}
     83
     84  # Add the base directories for convenience
     85  ${CMAKE_CURRENT_SOURCE_DIR}/external
     86  ${CMAKE_CURRENT_SOURCE_DIR}/libraries
     87  ${CMAKE_CURRENT_SOURCE_DIR}/modules
     88  ${CMAKE_CURRENT_SOURCE_DIR}/orxonox
    8589)
    8690
     91IF(CEGUILUA_USE_INTERNAL_LIBRARY)
     92  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/ceguilua/ceguilua-${CEGUI_VERSION})
     93ENDIF()
    8794
    8895################ Sub Directories ################
    8996
    90 # Third party libraries
    91 ADD_SUBDIRECTORY(tolua)
    92 
    93 # Include CEGUILua if not requested otherwise
    94 IF(CEGUILUA_USE_INTERNAL_LIBRARY)
    95   IF(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ceguilua/ceguilua-${CEGUI_VERSION})
    96     MESSAGE(FATAL_ERROR "CEGUILua version not found in src folder. Update list of supported versions in LibraryConfig.cmake!")
    97   ENDIF()
    98 
    99   INCLUDE_DIRECTORIES(ceguilua/ceguilua-${CEGUI_VERSION})
    100   ADD_SUBDIRECTORY(ceguilua)
    101 ENDIF()
    102 
    103 ADD_SUBDIRECTORY(bullet)
    104 ADD_SUBDIRECTORY(cpptcl)
    105 ADD_SUBDIRECTORY(ogreceguirenderer)
    106 ADD_SUBDIRECTORY(ois)
    107 ADD_SUBDIRECTORY(tinyxml)
    108 
    109 # Orxonox code
    110 ADD_SUBDIRECTORY(util)
    111 ADD_SUBDIRECTORY(core)
    112 ADD_SUBDIRECTORY(network)
     97ADD_SUBDIRECTORY(external)
     98ADD_SUBDIRECTORY(libraries)
     99ADD_SUBDIRECTORY(modules)
    113100ADD_SUBDIRECTORY(orxonox)
Note: See TracChangeset for help on using the changeset viewer.