Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 354


Ignore:
Timestamp:
Nov 29, 2007, 6:04:53 PM (17 years ago)
Author:
nicolasc
Message:

removed all STATIC flags — according to besch it's worth it
some minor changes in root-CML

Location:
code/branches/FICN
Files:
5 edited

Legend:

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

    r341 r354  
    11PROJECT(Orxonox)
    2 
    32#set some global variables, which are use throughout the project
    43
     
    98SET(Boost_INCLUDE_DIR "/usr/include/boost/")
    109
    11 #force-set the compile on tardis machines, as default points to g++-3.3
     10# force-set the compile on tardis machines, as default points to g++-3.3
    1211# only run this test on a lunix/unix machine
    1312IF (UNIX)
     13
    1414  FIND_PROGRAM(UNAME_CMD "uname"
    15         PATHS "/usr/bin /bin")
     15  PATHS "/usr/bin /bin")
    1616  IF(NOT UNAME_CMD)
    17         MESSAGE("Unable to find uname. Tardis-Check cannot be done.")
     17    MESSAGE("Unable to find uname. Tardis-Check cannot be done.")
    1818  ENDIF(NOT UNAME_CMD)
     19
     20  # run uname -n to get nodename
    1921  EXECUTE_PROCESS(
    20         COMMAND "${UNAME_CMD}" "-n"
    21         RESULT_VARIABLE UNAME_RV
    22         ERROR_VARIABLE UNAME_EV
    23         OUTPUT_VARIABLE UNAME_OV)
     22  COMMAND "${UNAME_CMD}" "-n"
     23  RESULT_VARIABLE UNAME_RV
     24  ERROR_VARIABLE UNAME_EV
     25  OUTPUT_VARIABLE UNAME_OV)
    2426
    2527  IF (NOT "${UNAME_RV}" STREQUAL "0")
    26         MESSAGE("ERROR: uname terminated unclean.")
     28    MESSAGE("ERROR: uname terminated unclean.")
    2729  ENDIF (NOT "${UNAME_RV}" STREQUAL "0")
    28 # check wheter we are on a tardis INCLUDEmachine
     30
     31  # check wheter we are on a tardis machine
    2932  IF ("${UNAME_OV}" MATCHES "tardis")
    3033    SET (IS_TARDIS "tardis")
    3134  ENDIF ("${UNAME_OV}" MATCHES "tardis")
     35
    3236  # if on tardis change compiler
    3337  IF (IS_TARDIS)
    34   MESSAGE("System is a TARDIS: Setting Compiler to g++-4.1.1")
    35   SET(CMAKE_CXX_COMPILER "g++-4.1.1")
    36 # reset eNet serach path
    37   SET(Boost_INCLUDE_DIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include/boost-1_34_1")
     38    MESSAGE("System is a TARDIS: Setting Compiler to g++-4.1.1")
     39    SET(CMAKE_CXX_COMPILER "g++-4.1.1")
     40    # reset eNet serach path
     41    SET(Boost_INCLUDE_DIR "/usr/pack/boost-1.34.1-sd/i686-debian-linux3.1/include/boost-1_34_1")
    3842  ENDIF(IS_TARDIS)
     43
    3944ENDIF (UNIX)
    4045
     
    7681#add main source dir
    7782ADD_SUBDIRECTORY(src)
    78 
  • code/branches/FICN/src/CMakeLists.txt

    r341 r354  
    66ADD_SUBDIRECTORY(network)
    77ADD_SUBDIRECTORY(orxonox)
     8
     9# xml get handled by loader
  • code/branches/FICN/src/orxonox/core/CMakeLists.txt

    r348 r354  
    99)
    1010
    11 ADD_LIBRARY(core STATIC ${CORE_SRC_FILES})
     11ADD_LIBRARY(core ${CORE_SRC_FILES})
  • code/branches/FICN/src/orxonox/hud/CMakeLists.txt

    r348 r354  
    88LINK_DIRECTORIES(.)
    99
    10 ADD_LIBRARY(hud STATIC ${HUD_SRC_FILES})
     10ADD_LIBRARY(hud ${HUD_SRC_FILES})
  • code/branches/FICN/src/orxonox/objects/CMakeLists.txt

    r348 r354  
    88)
    99
    10 ADD_LIBRARY(objects STATIC ${OBJECTS_SRC_FILES})
     10ADD_LIBRARY(objects ${OBJECTS_SRC_FILES})
Note: See TracChangeset for help on using the changeset viewer.