Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 25, 2013, 4:10:21 PM (11 years ago)
Author:
jo
Message:

merging latest trunk into branch 'levelMichael'

Location:
code/branches/levelMichael
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/levelMichael

  • code/branches/levelMichael/cmake/LibraryConfig.cmake

    r9687 r9823  
    160160# Expand the next statement if newer boost versions are released
    161161SET(Boost_ADDITIONAL_VERSIONS 1.40 1.40.0 1.41 1.41.0 1.42 1.42.0 1.43 1.43.0
    162                               1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1)
     162                              1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1 1.49.0
     163                              1.53.0)
    163164IF(NOT TARDIS)
    164165  FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
Note: See TracChangeset for help on using the changeset viewer.