Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1977


Ignore:
Timestamp:
Oct 20, 2008, 5:53:30 PM (16 years ago)
Author:
adrfried
Message:

further cleanup

Location:
code/branches/buildsystem
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem/CMakeLists.txt

    r1975 r1977  
    1313SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
    1414
    15 # Check whether we are on a tardis box
     15# Check whether we are on a tardis box and set customized paths
    1616INCLUDE(CheckTardis)
    17 
    1817
    1918############## Testing options ##################
    2019
    21 OPTION(TESTING_ENABLED "Do you want to enable Testing")
    22 IF (TESTING_ENABLED)
    23   ENABLE_TESTING()
    24 ENDIF(TESTING_ENABLED)
    25 
    26 OPTION (NETWORK_TESTING_ENABLED "Do you want to build network testing tools: i.e. chatclient chatserver and alike")
    27 OPTION (NETWORKTRAFFIC_TESTING_ENABLED "Do you want to build dummyserver4 and dummyclient4")
    28 
     20#OPTION(TESTING_ENABLED "Do you want to enable Testing")
     21#IF (TESTING_ENABLED)
     22#  ENABLE_TESTING()
     23#ENDIF(TESTING_ENABLED)
     24#
     25#OPTION (NETWORK_TESTING_ENABLED "Do you want to build network testing tools: i.e. chatclient chatserver and alike")
     26#OPTION (NETWORKTRAFFIC_TESTING_ENABLED "Do you want to build dummyserver4 and dummyclient4")
    2927
    3028########## Compiler/Linker options ##############
    3129
    32 # if on tardis change compiler and reset boost include directory
    33 IF(IS_TARDIS)
    34   MESSAGE("System is a TARDIS: Setting Compiler to g++-4.1.1")
    35   # Force-set the compiler on tardis machines, as default points to g++-3.3
    36   SET(CMAKE_CXX_COMPILER "g++-4.1.1")
    37   # Reset Boost serach path
    38   SET(Boost_INCLUDE_DIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include")
    39 ELSE (IS_TARDIS)
    40   IF (NOT WIN32)
    41     SET(Boost_INCLUDE_DIR "/usr/include/boost")
    42   ENDIF (NOT WIN32)
    43 ENDIF(IS_TARDIS)
    44 
    4530# Set binary output directories
    4631SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    47 SET(LIBRARY_OUTPUT_PATH    ${PROJECT_BINARY_DIR}/bin/lib)
     32SET(LIBRARY_OUTPUT_PATH    ${PROJECT_BINARY_DIR}/bin)
    4833
    49 # Set PATH on Windows, so it finds the DLLs
    50 IF(CMAKE_HOST_WIN32)
    51   FILE(TO_NATIVE_PATH "${LIBRARY_OUTPUT_PATH}" _native_library_path)
    52   SET(ENV{PATH} "$ENV{PATH}:${_native_library_path}")
    53 ENDIF(CMAKE_HOST_WIN32)
    54 
    55 # Global compiler/linker flags. force -O2!
    56 SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -O0 -Wall -g -ggdb")
    57 SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb")
     34# Global compiler/linker flags.
     35SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -Wall -Wextra -Wno-unused-parameter -g -ggdb")
     36SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -Wall -Wextra -Wno-unused-parameter -g -ggdb")
    5837#SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -O3")
    5938#SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O3")
     
    6342SET(CMAKE_SHARED_LINKER_FLAGS " --no-undefined")
    6443SET(CMAKE_MODULE_LINKER_FLAGS " --no-undefined")
    65 
    66 # Use 'cmake -D make_verb:1 path' to get verbose make output when compiling
    67 IF (MAKE_VERB)
    68  SET(CMAKE_VERBOSE_MAKEFILE TRUE)
    69 ENDIF (MAKE_VERB)
    70 
    7144
    7245############### Library finding #################
     
    8659    ENDIF ($ENV{ORXONOX_DEV})
    8760    SET(Boost_LIB_SUFFIX_DEBUG vc80-mt-gd-1_35)
     61    #MESSAGE(STATUS ${DEPENDENCY_DIR})
    8862  ENDIF (MSVC)
    8963ENDIF (WIN32)
    90 MESSAGE(STATUS ${DEPENDENCY_DIR})
    9164
    9265# Performs the search and sets the variables
    93 FIND_PACKAGE(OGRE)
    94 FIND_PACKAGE(CEGUI)
    95 # FIND_PACKAGE(CEGUI_OGRE)
    96 FIND_PACKAGE(ENet)
     66FIND_PACKAGE(OGRE REQUIRED)
     67FIND_PACKAGE(CEGUI REQUIRED)
     68#FIND_PACKAGE(CEGUI_OGRE REQUIRED)
     69FIND_PACKAGE(ENet REQUIRED)
    9770FIND_PACKAGE(Boost REQUIRED thread filesystem)
    98 FIND_PACKAGE(OpenAL)
    99 FIND_PACKAGE(ALUT)
    100 FIND_PACKAGE(OggVorbis)
    101 FIND_PACKAGE(ZLIB)
    102 FIND_PACKAGE(Lua50)
    103 FIND_PACKAGE(TCL)
    104 FIND_PACKAGE(DirectX)
    105 
    106 # Set the search paths for the linking
    107 LINK_DIRECTORIES(
    108   ${OGRE_LIB_DIR}
    109   ${CEGUI_LIB_DIR}
    110 #  ${CEGUI_SCRIPT_LIB_DIR}
    111 #  ${CEGUI_OGRE_LIB_DIR}
    112   ${ENet_LIBRARY}
    113   ${Boost_LIBRARY_DIRS}
    114   ${Zlib_LIBRARY_DIR}
    115   ${TCL_LIBRARY}
    116 )
    117 
    118 # Set the search paths for include files
    119 INCLUDE_DIRECTORIES(
    120   ${OGRE_INCLUDE_DIR}
    121   ${CEGUI_INCLUDE_DIR}
    122 #  ${CEGUI_OGRE_INCLUDE_DIR}
    123   ${ENet_INCLUDE_DIR}
    124   ${Boost_INCLUDE_DIRS}
    125   ${OPENAL_INCLUDE_DIR}
    126   ${ALUT_INCLUDE_DIR}
    127   ${VORBIS_INCLUDE_DIR}
    128   ${OGG_INCLUDE_DIR}
    129 #  ${Lua_INCLUDE_DIR}
    130   ${TCL_INCLUDE_PATH}
    131   ${DirectX_INCLUDE_DIR}
    132   ${ZLIB_INCLUDE_DIR}
    133 )
     71FIND_PACKAGE(OpenAL REQUIRED)
     72FIND_PACKAGE(ALUT REQUIRED)
     73FIND_PACKAGE(OggVorbis REQUIRED)
     74FIND_PACKAGE(ZLIB REQUIRED)
     75FIND_PACKAGE(Lua50 REQUIRED)
     76FIND_PACKAGE(TCL REQUIRED)
     77FIND_PACKAGE(DirectX REQUIRED)
    13478
    13579# Add main source dir
  • code/branches/buildsystem/cmake/CheckTardis.cmake

    r1976 r1977  
    3535IF (IS_TARDIS)
    3636  MESSAGE(STATUS "Running on D-ITET isg.ee Tardis Computer. Using customized paths.")
     37  SET(CMAKE_C_COMPILER "gcc-4.1.1")
     38  SET(CMAKE_CXX_COMPILER "g++-4.1.1")
     39  SET(BOOST_ROOT "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1")
    3740  SET($ENV{LUA_DIR} "/usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib")
    3841ENDIF (IS_TARDIS)
  • code/branches/buildsystem/src/CMakeLists.txt

    r1975 r1977  
    1 INCLUDE_DIRECTORIES(.)
    2 INCLUDE_DIRECTORIES(..)
    3 INCLUDE_DIRECTORIES(ois) # for ois library subfolders
    4 INCLUDE_DIRECTORIES(orxonox)
    5 #INCLUDE_DIRECTORIES(lua) # for tolua library and generator
    6 INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
     1# Set the search paths for include files
     2INCLUDE_DIRECTORIES(
     3  ${OGRE_INCLUDE_DIR}
     4  ${CEGUI_INCLUDE_DIR}
     5#  ${CEGUI_OGRE_INCLUDE_DIR}
     6  ${ENet_INCLUDE_DIR}
     7  ${Boost_INCLUDE_DIRS}
     8  ${OPENAL_INCLUDE_DIR}
     9  ${ALUT_INCLUDE_DIR}
     10  ${VORBIS_INCLUDE_DIR}
     11  ${OGG_INCLUDE_DIR}
     12  ${LUA_INCLUDE_DIR}
     13  ${TCL_INCLUDE_PATH}
     14  ${DirectX_INCLUDE_DIR}
     15  ${ZLIB_INCLUDE_DIR}
     16)
     17
     18# Set the search paths for the linking
     19LINK_DIRECTORIES(
     20  ${OGRE_LIB_DIR}
     21  ${CEGUI_LIB_DIR}
     22#  ${CEGUI_SCRIPT_LIB_DIR}
     23#  ${CEGUI_OGRE_LIB_DIR}
     24  ${ENet_LIBRARY}
     25  ${Boost_LIBRARY_DIRS}
     26  ${Zlib_LIBRARY_DIR}
     27  ${TCL_LIBRARY}
     28)
     29
     30INCLUDE_DIRECTORIES(
     31  .
     32  ..
     33  ois
     34  orxonox
     35)
    736
    837ADD_SUBDIRECTORY(cpptcl)
     
    1241ADD_SUBDIRECTORY(tolua)
    1342
     43# TODO: write include file for this stuff
    1444# Some people may not have CEGUILua installed, espc. with version 0.5
    1545# And we don't know what lua version it was linked against, so we compile
  • code/branches/buildsystem/src/core/CMakeLists.txt

    r1975 r1977  
    5959TARGET_LINK_LIBRARIES(core
    6060  ${OGRE_LIBRARIES}
    61   ${Boost_thread_LIBRARIES}
    62   ${Boost_filesystem_LIBRARIES}
     61  ${Boost_THREAD_LIBRARY}
     62  ${Boost_FILESYSTEM_LIBRARY}
    6363  ${LUA_LIBRARIES}
    6464  cpptcl_orxonox
  • code/branches/buildsystem/src/network/CMakeLists.txt

    r1740 r1977  
    2828  ${ZLIB_LIBRARY}
    2929  ${ENet_LIBRARY}
    30   ${Boost_thread_LIBRARIES}
     30  ${Boost_THREAD_LIBRARY}
    3131  core
    3232)
  • code/branches/buildsystem/src/orxonox/CMakeLists.txt

    r1975 r1977  
    9898  ${CEGUI_LIBRARIES}
    9999  ${LUA_LIBRARIES}
     100  # TODO: write include file for this
    100101  CEGUILuaScriptModule
    101102  tinyxml_orxonox
Note: See TracChangeset for help on using the changeset viewer.