Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8558 for code/branches


Ignore:
Timestamp:
May 24, 2011, 4:15:19 AM (14 years ago)
Author:
rgrieder
Message:

Renamed the infamous 'Compilation' to 'BuildUnit' which definitely suits better and avoids much of the general confusion.
There are no actual changes, just the renaming.

Location:
code/branches/unity_build
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • code/branches/unity_build/cmake/tools/SourceFileUtilities.cmake

    r7818 r8558  
    2525 #                             adds the current directory.
    2626 #                             Also compiles multiple source files into a single
    27  #                             one by including them
    28  #                             Use COMPILATION_[BEGIN|END] in
     27 #                             translation unit (faster)
     28 #                             Use [END_]BUILD_UNIT in
    2929 #                             [ADD|SET]_SOURCE_FILES and specify the name of
    30  #                             the new source file after COMPILATION_BEGIN
     30 #                             the new source file after BUILD_UNIT
    3131 #    GET_ALL_HEADER_FILES   - Finds all header files recursively.
    3232 #    GENERATE_SOURCE_GROUPS - Set Visual Studio source groups.
    … …  
    3636  SET(_source_files)
    3737  FOREACH(_file ${ARGN})
    38     IF(_file MATCHES "^(COMPILATION_BEGIN|COMPILATION_END)$")
     38    IF(_file MATCHES "^(BUILD_UNIT|END_BUILD_UNIT)$")
    3939      # Append keywords verbatim
    4040      LIST(APPEND _source_files ${_file})

  • code/branches/unity_build/cmake/tools/TargetUtilities.cmake

    r8421 r8558  
    9595  PARSE_MACRO_ARGUMENTS("${_switches}" "${_list_names}" ${ARGN})
    9696
    97   # Process source files with support for compilations
     97  # Process source files with support for build units
    9898  # Note: All file paths are relative to the root source directory, even the
    99   #       name of the compilation file.
     99  #       name of the build unit.
    100100  SET(_${_target_name}_source_files)
    101   SET(_get_compilation_file FALSE)
    102   SET(_add_to_compilation FALSE)
     101  SET(_get_build_unit_file FALSE)
     102  SET(_add_to_build_unit FALSE)
    103103  FOREACH(_file ${_arg_SOURCE_FILES})
    104     IF(_file STREQUAL "COMPILATION_BEGIN")
    105       # Next file is the name of the compilation
    106       SET(_get_compilation_file TRUE)
    107     ELSEIF(_file STREQUAL "COMPILATION_END")
    108       IF(NOT _compilation_file)
    109         MESSAGE(FATAL_ERROR "No name provided for source file compilation")
    110       ENDIF()
    111       IF(NOT DISABLE_COMPILATIONS)
    112         IF(NOT _compilation_include_string)
    113           MESSAGE(STATUS "Warning: Empty source file compilation!")
    114         ENDIF()
    115         IF(EXISTS ${_compilation_file})
    116           FILE(READ ${_compilation_file} _include_string_file)
    117         ENDIF()
    118         IF(NOT _compilation_include_string STREQUAL "${_include_string_file}")
    119           FILE(WRITE ${_compilation_file} "${_compilation_include_string}")
    120         ENDIF()
    121         LIST(APPEND _${_target_name}_source_files ${_compilation_file})
    122       ENDIF()
    123       SET(_add_to_compilation FALSE)
    124     ELSEIF(_get_compilation_file)
    125       SET(_compilation_file ${CMAKE_BINARY_DIR}/${_file})
    126       SET(_get_compilation_file FALSE)
    127       SET(_add_to_compilation TRUE)
    128       SET(_compilation_include_string)
     104    IF(_file STREQUAL "BUILD_UNIT")
     105      # Next file is the name of the build unit
     106      SET(_get_build_unit_file TRUE)
     107    ELSEIF(_file STREQUAL "END_BUILD_UNIT")
     108      IF(NOT _build_unit_file)
     109        MESSAGE(FATAL_ERROR "No name provided for build unit")
     110      ENDIF()
     111      IF(NOT DISABLE_BUILD_UNITS)
     112        IF(NOT _build_unit_include_string)
     113          MESSAGE(STATUS "Warning: Empty build unit!")
     114        ENDIF()
     115        IF(EXISTS ${_build_unit_file})
     116          FILE(READ ${_build_unit_file} _include_string_file)
     117        ENDIF()
     118        IF(NOT _build_unit_include_string STREQUAL "${_include_string_file}")
     119          FILE(WRITE ${_build_unit_file} "${_build_unit_include_string}")
     120        ENDIF()
     121        LIST(APPEND _${_target_name}_source_files ${_build_unit_file})
     122      ENDIF()
     123      SET(_add_to_build_unit FALSE)
     124    ELSEIF(_get_build_unit_file)
     125      SET(_build_unit_file ${CMAKE_BINARY_DIR}/${_file})
     126      SET(_get_build_unit_file FALSE)
     127      SET(_add_to_build_unit TRUE)
     128      SET(_build_unit_include_string)
    129129    ELSE()
    130130      # Default, add source file
    … …  
    146146      LIST(APPEND _${_target_name}_source_files ${_file})
    147147
    148       # Handle compilations
    149       IF(_add_to_compilation AND NOT DISABLE_COMPILATIONS)
     148      # Handle build units
     149      IF(_add_to_build_unit AND NOT DISABLE_BUILD_UNITS)
    150150        IF(_file MATCHES "\\.(c|cc|cpp|cxx)$")
    151           SET(_compilation_include_string "${_compilation_include_string}#include \"${_file}\"\n")
     151          SET(_build_unit_include_string "${_build_unit_include_string}#include \"${_file}\"\n")
    152152        ENDIF()
    153153        # Don't compile these files, even if they are source files

  • code/branches/unity_build/src/CMakeLists.txt

    r8420 r8558  
    6666      ADD_LINKER_FLAGS   ("-INCREMENTAL:NO"  Debug)
    6767    ENDIF()
    68     IF(NOT DISABLE_COMPILATIONS)
    69       # Compilations seem to generate 'memory leaks' with static variables
    70       MESSAGE("Warning: You should disable Compilations when using VLD!")
     68    IF(NOT DISABLE_BUILD_UNITS)
     69      # Build units seem to generate 'memory leaks' with static variables
     70      MESSAGE("Warning: You should disable build units when using VLD!")
    7171    ENDIF()
    7272  ENDIF()

  • code/branches/unity_build/src/OrxonoxConfig.cmake

    r8412 r8558  
    3535
    3636# Global switch to disable multiple file compilations
    37 OPTION(DISABLE_COMPILATIONS "Global multi-file compilation switch" FALSE)
     37OPTION(DISABLE_BUILD_UNITS "Disables building multiple source files as one." FALSE)
    3838
    3939# Use WinMain() or main()?

  • code/branches/unity_build/src/external/bullet/BulletCollision/CMakeLists.txt

    r8393 r8558  
    11ADD_SOURCE_FILES(BULLET_FILES
    22
    3 COMPILATION_BEGIN BulletCollisionCompilation.cpp
     3BUILD_UNIT BulletCollisionBuildUnit.cpp
    44
    55        BroadphaseCollision/btAxisSweep3.cpp
    … …  
    8888        NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
    8989
    90 COMPILATION_END
     90END_BUILD_UNIT
    9191
    92     # Raises compiler errors when compiled inside the compilation
     92    # Raises compiler errors when compiled inside the build unit
    9393        NarrowPhaseCollision/btPolyhedralContactClipping.cpp
    9494

  • code/branches/unity_build/src/external/bullet/BulletDynamics/CMakeLists.txt

    r8351 r8558  
    11ADD_SOURCE_FILES(BULLET_FILES
    22
    3 COMPILATION_BEGIN BulletDynamicsCompilation.cpp
     3BUILD_UNIT BulletDynamicsBuildUnit.cpp
    44
    55        Character/btKinematicCharacterController.cpp
    … …  
    2626        Vehicle/btWheelInfo.cpp
    2727
    28 COMPILATION_END
     28END_BUILD_UNIT
    2929
    3030        # Headers

  • code/branches/unity_build/src/external/bullet/LinearMath/CMakeLists.txt

    r8393 r8558  
    11ADD_SOURCE_FILES(BULLET_FILES
    22
    3 COMPILATION_BEGIN BulletLinearMathCompilation.cpp
     3BUILD_UNIT BulletLinearMathBuildUnit.cpp
    44        btAlignedAllocator.cpp
    55        btConvexHull.cpp
    6     btConvexHullComputer.cpp
     6        btConvexHullComputer.cpp
    77        btGeometryUtil.cpp
    88        btQuickprof.cpp
    99        btSerializer.cpp
    10 COMPILATION_END
     10END_BUILD_UNIT
    1111
    1212        # Headers
    … …  
    1515        btAlignedObjectArray.h
    1616        btConvexHull.h
    17     btConvexHullComputer.h
     17        btConvexHullComputer.h
    1818        btDefaultMotionState.h
    1919        btGeometryUtil.h

  • code/branches/unity_build/src/external/enet/CMakeLists.txt

    r8351 r8558  
    2929    win32.h
    3030
    31 COMPILATION_BEGIN ENetCompilation.c
     31BUILD_UNIT ENetBuildUnit.c
    3232    callbacks.c
    3333    compress.c
    … …  
    3939    unix.c
    4040    win32.c
    41 COMPILATION_END
     41END_BUILD_UNIT
    4242)
    4343

  • code/branches/unity_build/src/external/ogreceguirenderer/CMakeLists.txt

    r8351 r8558  
    2323  OgreCEGUITexture.h
    2424
    25 COMPILATION_BEGIN OgreCEGUIRendererCompilation.cpp
     25BUILD_UNIT OgreCEGUIRendererBuildUnit.cpp
    2626  OgreCEGUIRenderer.cpp
    2727  OgreCEGUIResourceProvider.cpp
    2828  OgreCEGUITexture.cpp
    29 COMPILATION_END
     29END_BUILD_UNIT
    3030)
    3131

  • code/branches/unity_build/src/external/ois/CMakeLists.txt

    r8351 r8558  
    3535  OISPrereqs.h
    3636
    37 #COMPILATION_BEGIN OISCompilation.cpp
     37#BUILD_UNIT OISBuildUnit.cpp
    3838  OISEffect.cpp
    3939  OISException.cpp
    … …  
    4343  OISKeyboard.cpp
    4444  OISObject.cpp
    45 #COMPILATION_END
     45#END_BUILD_UNIT
    4646)
    4747IF(WIN32)

  • code/branches/unity_build/src/external/ois/linux/CMakeLists.txt

    r5929 r8558  
    88  LinuxPrereqs.h
    99
    10 COMPILATION_BEGIN OISLinuxCompilation.cpp
     10BUILD_UNIT OISLinuxBuildUnit.cpp
    1111  EventHelpers.cpp
    1212  LinuxForceFeedback.cpp
    … …  
    1515  LinuxKeyboard.cpp
    1616  LinuxMouse.cpp
    17 COMPILATION_END
     17END_BUILD_UNIT
    1818)

  • code/branches/unity_build/src/external/ois/mac/CMakeLists.txt

    r8351 r8558  
    88  MacPrereqs.h
    99
    10 #COMPILATION_BEGIN OISMacCompilation.cpp
     10#BUILD_UNIT OISMacBuildUnit.cpp
    1111  MacHelpers.cpp
    1212  MacHIDManager.cpp
    … …  
    1515  MacKeyboard.cpp
    1616  MacMouse.cpp
    17 #COMPILATION_END
     17#END_BUILD_UNIT
    1818)

  • code/branches/unity_build/src/external/ois/win32/CMakeLists.txt

    r5929 r8558  
    77  Win32Prereqs.h
    88
    9 COMPILATION_BEGIN OISWin32Compilation.cpp
     9BUILD_UNIT OISWin32BuildUnit.cpp
    1010  Win32ForceFeedback.cpp
    1111  Win32InputManager.cpp
    … …  
    1313  Win32KeyBoard.cpp
    1414  Win32Mouse.cpp
    15 COMPILATION_END
     15END_BUILD_UNIT
    1616)

  • code/branches/unity_build/src/external/tinyxml/CMakeLists.txt

    r8351 r8558  
    2424  tinyxml.h
    2525
    26 COMPILATION_BEGIN TicppCompilation.cpp
     26BUILD_UNIT TicppBuildUnit.cpp
    2727  ticpp.cpp
    2828  tinystr.cpp
    … …  
    3030  tinyxmlerror.cpp
    3131  tinyxmlparser.cpp
    32 COMPILATION_END
     32END_BUILD_UNIT
    3333)
    3434

  • code/branches/unity_build/src/libraries/core/CMakeLists.txt

    r8351 r8558  
    4949  XMLPort.cc
    5050
    51 COMPILATION_BEGIN ListenerCompilation.cc
     51BUILD_UNIT ListenerBuildUnit.cc
    5252  ViewportEventListener.cc
    5353  WindowEventListener.cc
    5454  XMLNameListener.cc
    55 COMPILATION_END
     55END_BUILD_UNIT
    5656
    57 COMPILATION_BEGIN FilesystemCompilation.cc
     57BUILD_UNIT FilesystemBuildUnit.cc
    5858  command/ArgumentCompletionFunctions.cc
    5959  ConfigFileManager.cc
    6060  PathConfig.cc
    61 COMPILATION_END
     61END_BUILD_UNIT
    6262
    6363  # multithreading
    6464  ThreadPool.cc
    65 COMPILATION_BEGIN ThreadCompilation.cc
     65BUILD_UNIT ThreadBuildUnit.cc
    6666  command/TclThreadManager.cc
    6767  Thread.cc
    68 COMPILATION_END
     68END_BUILD_UNIT
    6969)
    7070

  • code/branches/unity_build/src/libraries/network/packet/CMakeLists.txt

    r7314 r8558  
    11ADD_SOURCE_FILES(NETWORK_SRC_FILES
    2 COMPILATION_BEGIN PacketCompilation.cc
     2
     3BUILD_UNIT PacketBuildUnit.cc
    34  Acknowledgement.cc
    45  Chat.cc
    … …  
    1011  Packet.cc
    1112  Welcome.cc
    12 COMPILATION_END
     13END_BUILD_UNIT
     14
    1315  ServerInformation.cc
    1416)

  • code/branches/unity_build/src/libraries/tools/CMakeLists.txt

    r8351 r8558  
    11SET_SOURCE_FILES(TOOLS_SRC_FILES
    2 COMPILATION_BEGIN ResourceCompilation.cc
     2
     3BUILD_UNIT ResourceBuildUnit.cc
    34  ResourceCollection.cc
    45  ResourceLocation.cc
    5 COMPILATION_END
     6END_BUILD_UNIT
     7
    68  TextureGenerator.cc
    79  Timer.cc
    8 COMPILATION_BEGIN OgreCompilation.cc
     10
     11BUILD_UNIT OgreBuildUnit.cc
    912  BillboardSet.cc
    1013  DynamicLines.cc
    … …  
    1316  ParticleInterface.cc
    1417  Shader.cc
    15 COMPILATION_END
     18END_BUILD_UNIT
    1619)
     20
    1721#ADD_SUBDIRECTORY(bsp)
    1822ADD_SUBDIRECTORY(interfaces)

  • code/branches/unity_build/src/libraries/util/CMakeLists.txt

    r8351 r8558  
    1919
    2020SET_SOURCE_FILES(UTIL_SRC_FILES
    21 COMPILATION_BEGIN StableCompilation.cc
     21
     22BUILD_UNIT StableBuildUnit.cc
    2223  Clipboard.cc
    2324  Clock.cc
    … …  
    3233  SmallObjectAllocator.cc
    3334  SubString.cc
    34 COMPILATION_END
     35END_BUILD_UNIT
    3536
    3637  MultiType.cc

  • code/branches/unity_build/src/modules/pong/CMakeLists.txt

    r7163 r8558  
    11SET_SOURCE_FILES(PONG_SRC_FILES
    2 COMPILATION_BEGIN PongCompilation.cc
     2BUILD_UNIT PongBuildUnit.cc
    33  Pong.cc
    44  PongAI.cc
    … …  
    88  PongCenterpoint.cc
    99  PongScore.cc
    10 COMPILATION_END
     10END_BUILD_UNIT
    1111)
    1212

  • code/branches/unity_build/src/orxonox/CMakeLists.txt

    r8351 r8558  
    3535  ChatInputHandler.cc
    3636#  Test.cc
    37 COMPILATION_BEGIN SceneCompilation.cc
     37
     38BUILD_UNIT SceneBuildUnit.cc
    3839  CameraManager.cc
    3940  Scene.cc
    40 COMPILATION_END
     41END_BUILD_UNIT
    4142)
    4243

  • code/branches/unity_build/src/orxonox/graphics/CMakeLists.txt

    r7163 r8558  
    99  ParticleEmitter.cc
    1010  ParticleSpawner.cc
    11 COMPILATION_BEGIN GraphicsCompilation.cc
     11
     12BUILD_UNIT GraphicsBuildUnit.cc
    1213  Backlight.cc
    1314  Camera.cc
    1415  Light.cc
    15 COMPILATION_END
     16END_BUILD_UNIT
    1617)
Note: See TracChangeset for help on using the changeset viewer.