Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2130


Ignore:
Timestamp:
Nov 4, 2008, 1:40:54 PM (11 years ago)
Author:
rgrieder
Message:

Trunk should be functional again with these changes

Location:
code/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/cmake/AddSourceFiles.cmake

    r2129 r2130  
    1 MACRO(ADD_SOURCE_FILES _directory _source_list _target_list)
     1MACRO(ADD_SOURCE_DIRECTORY _target_list _directory)
    22
    3   # Set the variable (_source_list) first
    4   INCLUDE(${_directory}/CMakeLists.txt)
    5 #MESSAGE(STATUS ${_directory})
    6 #MESSAGE(STATUS "${_source_list}")
    7 #MESSAGE(STATUS "${${_source_list}}")
     3  # Subfolder puts source files into CMake Cache variable _CACHED_SOURCE_FILES
     4  ADD_SUBDIRECTORY(${_directory})
    85
    9   FOREACH(_source_file ${${_source_list}})
    10         LIST(APPEND ${_target_list} "${_directory}/${_source_file}")
    11 #MESSAGE(STATUS ${${_target_list}})
     6  # Put the directory name in front of each source file from the subfolder
     7  # and add it to the source list in the current directory
     8  FOREACH(_source_file ${_CACHED_SOURCE_FILES})
     9    LIST(APPEND ${_target_list} "${_directory}/${_source_file}")
    1210  ENDFOREACH(_source_file)
     11
     12ENDMACRO(ADD_SOURCE_DIRECTORY)
     13
     14
     15MACRO(ADD_SOURCE_FILES _source_list)
     16 
     17  # Put the source file into a variable that still exists in this_folder/../
     18  # Use FORCE to always overwrite the cache variable
     19  SET(_CACHED_SOURCE_FILES ${${_source_list}} CACHE STRING "" FORCE)
     20  MARK_AS_ADVANCED(_CACHED_SOURCE_FILES FORCE)
     21
    1322ENDMACRO(ADD_SOURCE_FILES)
  • code/trunk/src/orxonox/CMakeLists.txt

    r2129 r2130  
    99)
    1010
    11 ADD_SOURCE_FILES(gamestates ORXONOX_GAMESTATES_SRC_FILES ORXONOX_SRC_FILES)
    12 ADD_SOURCE_FILES(gui        ORXONOX_GUI_SRC_FILES        ORXONOX_SRC_FILES)
    13 ADD_SOURCE_FILES(objects    ORXONOX_OBJECTS_SRC_FILES    ORXONOX_SRC_FILES)
    14 ADD_SOURCE_FILES(overlays   ORXONOX_OVERLAYS_SRC_FILES   ORXONOX_SRC_FILES)
    15 ADD_SOURCE_FILES(tools      ORXONOX_TOOLS_SRC_FILES      ORXONOX_SRC_FILES)
     11ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES gamestates)
     12ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES gui)
     13ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES objects)
     14ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES overlays)
     15ADD_SOURCE_DIRECTORY(ORXONOX_SRC_FILES tools)
    1616
    1717GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
  • code/trunk/src/orxonox/gamestates/CMakeLists.txt

    r2129 r2130  
    1 SET( ORXONOX_GAMESTATES_SRC_FILES
     1SET( SRC_FILES
    22  GSDedicated.cc
    33  GSClient.cc
     
    1111)
    1212
     13ADD_SOURCE_FILES(SRC_FILES)
     14
  • code/trunk/src/orxonox/gui/CMakeLists.txt

    r2129 r2130  
    1 SET( ORXONOX_GUI_SRC_FILES
     1SET( SRC_FILES
    22  GUIManager.cc
    33  OgreCEGUIRenderer.cpp
     
    66)
    77
     8ADD_SOURCE_FILES(SRC_FILES)
     9
  • code/trunk/src/orxonox/objects/CMakeLists.txt

    r2129 r2130  
    1 SET( ORXONOX_OBJECTS_SRC_FILES
     1SET( SRC_FILES
    22  EventListener.cc
    33  EventDispatcher.cc
     
    6464)
    6565
    66 ADD_SOURCE_FILES(controllers      ORXONOX_OBJECTS_CONTROLLERS_SRC_FILES      ORXONOX_OBJECTS_SRC_FILES)
     66ADD_SOURCE_DIRECTORY(SRC_FILES controllers)
     67
     68ADD_SOURCE_FILES(SRC_FILES)
     69
  • code/trunk/src/orxonox/objects/controllers/CMakeLists.txt

    r2129 r2130  
    1 SET( ORXONOX_OBJECTS_CONTROLLERS_SRC_FILES
     1SET( SRC_FILES
    22  Controller.cc
    33  HumanController.cc
    44)
     5
     6ADD_SOURCE_FILES(SRC_FILES)
     7
  • code/trunk/src/orxonox/overlays/CMakeLists.txt

    r2129 r2130  
    1 SET( ORXONOX_OVERLAYS_SRC_FILES
     1SET( SRC_FILES
    22  OrxonoxOverlay.cc
    33  OverlayGroup.cc
     
    1616)
    1717
     18ADD_SOURCE_FILES(SRC_FILES)
     19
  • code/trunk/src/orxonox/tools/CMakeLists.txt

    r2129 r2130  
    1 SET( ORXONOX_TOOLS_SRC_FILES
     1SET( SRC_FILES
    22  BillboardSet.cc
    33  Mesh.cc
     
    88)
    99
     10ADD_SOURCE_FILES(SRC_FILES)
     11
Note: See TracChangeset for help on using the changeset viewer.