[Orxonox-commit 722] r3252 - branches/netp6/cmake

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-06-29 21:43:54 +0200 (Mon, 29 Jun 2009)
New Revision: 3252

Modified:
   branches/netp6/cmake/LibraryConfig.cmake
Log:
Boost >= 1.35 is now default


Modified: branches/netp6/cmake/LibraryConfig.cmake
===================================================================
--- branches/netp6/cmake/LibraryConfig.cmake	2009-06-29 16:13:26 UTC (rev 3251)
+++ branches/netp6/cmake/LibraryConfig.cmake	2009-06-29 19:43:54 UTC (rev 3252)
@@ -152,19 +152,11 @@
 ##### Boost #####
 # Expand the next statement if newer boost versions than 1.36.1 are released
 SET(Boost_ADDITIONAL_VERSIONS 1.37 1.37.0 1.38 1.38.0 1.39 1.39.0)
-# MSVC seems to be the only compiler requiring date_time
-IF(MSVC)
-  FIND_PACKAGE(Boost 1.34 REQUIRED thread filesystem date_time)
-ELSE(MSVC)
-  FIND_PACKAGE(Boost 1.34 REQUIRED thread filesystem)
-ENDIF(MSVC)
-# Boost 1.35 and newer also need the 'System' library
-IF(NOT Boost_VERSION LESS 103500)
-  FIND_PACKAGE(Boost 1.35 REQUIRED system)
-ENDIF()
+FIND_PACKAGE(Boost 1.35 REQUIRED thread filesystem system date_time)
 # No auto linking, so this option is useless anyway
 MARK_AS_ADVANCED(Boost_LIB_DIAGNOSTIC_DEFINITIONS)
 
+
 ####### Static/Dynamic linking options ##########
 
 # On Windows dynamically linked libraries need some special treatment