Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2566


Ignore:
Timestamp:
Jan 6, 2009, 10:26:42 AM (15 years ago)
Author:
rgrieder
Message:

Renamed special CMake configuration files.

Location:
code/branches/buildsystem2
Files:
1 edited
2 moved

Legend:

Unmodified
Added
Removed

  • code/branches/buildsystem2/CMakeLists.txt

    r2526 r2566  
    77
    88# Check for special include paths
    9 INCLUDE(CheckTardis)
    10 INCLUDE(CheckOrxonoxWinDeps)
     9INCLUDE(ConfigTardis)
     10INCLUDE(ConfigMinGW)
    1111
    1212################ Test options ###################

  • code/branches/buildsystem2/cmake/ConfigMinGW.cmake

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/buildsystem/cmake/CheckOrxonoxWinDeps.cmakemergedeligible
      /code/branches/ceguilua/cmake/CheckOrxonoxWinDeps.cmake1802-1808
      /code/branches/core3/cmake/CheckOrxonoxWinDeps.cmake1572-1739
      /code/branches/gcc43/cmake/CheckOrxonoxWinDeps.cmake1580
      /code/branches/gui/cmake/CheckOrxonoxWinDeps.cmake1635-1723
      /code/branches/input/cmake/CheckOrxonoxWinDeps.cmake1629-1636
      /code/branches/objecthierarchy/cmake/CheckOrxonoxWinDeps.cmake1911-2085,​2100,​2110-2169
      /code/branches/pickups/cmake/CheckOrxonoxWinDeps.cmake1926-2086
      /code/branches/questsystem/cmake/CheckOrxonoxWinDeps.cmake1894-2088
      /code/branches/questsystem2/cmake/CheckOrxonoxWinDeps.cmake2107-2259
      /code/branches/script_trigger/cmake/CheckOrxonoxWinDeps.cmake1295-1953,​1955
      /code/branches/weapon/cmake/CheckOrxonoxWinDeps.cmake1925-2094
    r2565 r2566  
    2626 #
    2727 
    28 ################# Win check ##################
     28############## MinGW config ###############
    2929# Set the library directory when using precompiled tarballs for
    3030# the dependencies under windows

  • code/branches/buildsystem2/cmake/ConfigTardis.cmake

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/buildsystem/cmake/CheckTardis.cmakemergedeligible
      /code/branches/questsystem2/cmake/CheckTardis.cmakemergedeligible
      /code/branches/ceguilua/cmake/CheckTardis.cmake1802-1808
      /code/branches/core3/cmake/CheckTardis.cmake1572-1739
      /code/branches/gcc43/cmake/CheckTardis.cmake1580
      /code/branches/gui/cmake/CheckTardis.cmake1635-1723
      /code/branches/input/cmake/CheckTardis.cmake1629-1636
      /code/branches/objecthierarchy/cmake/CheckTardis.cmake1911-2085,​2100,​2110-2169
      /code/branches/pickups/cmake/CheckTardis.cmake1926-2086
      /code/branches/questsystem/cmake/CheckTardis.cmake1894-2088
      /code/branches/script_trigger/cmake/CheckTardis.cmake1295-1953,​1955
      /code/branches/weapon/cmake/CheckTardis.cmake1925-2094
    r2565 r2566  
    1 ################# Tardis check ##################
     1################# Tardis config #################
    22# This code checks whether the current machine  #
    33# is an ETH tardis box.                         #
Note: See TracChangeset for help on using the changeset viewer.