[Orxonox-commit 3538] r8224 - code/branches/kicklib/cmake

rgrieder at orxonox.net rgrieder at orxonox.net
Sun Apr 10 21:02:15 CEST 2011


Author: rgrieder
Date: 2011-04-10 21:02:15 +0200 (Sun, 10 Apr 2011)
New Revision: 8224

Modified:
   code/branches/kicklib/cmake/LibraryConfig.cmake
Log:
Removed support for Boost versions less than 1.40.

Modified: code/branches/kicklib/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/kicklib/cmake/LibraryConfig.cmake	2011-04-10 09:09:36 UTC (rev 8223)
+++ code/branches/kicklib/cmake/LibraryConfig.cmake	2011-04-10 19:02:15 UTC (rev 8224)
@@ -134,23 +134,13 @@
 
 ##### Boost #####
 # Expand the next statement if newer boost versions are released
-SET(Boost_ADDITIONAL_VERSIONS 1.37 1.37.0 1.38 1.38.0 1.39 1.39.0 1.40 1.40.0
-                              1.41 1.41.0 1.42 1.42.0 1.43 1.43.0 1.44 1.44.0
-                              1.45 1.45.0 1.46 1.46.0 1.46.1)
-IF( NOT TARDIS )
-  FIND_PACKAGE(Boost 1.35 REQUIRED thread filesystem system date_time)
+SET(Boost_ADDITIONAL_VERSIONS 1.40 1.40.0 1.41 1.41.0 1.42 1.42.0 1.43 1.43.0
+                              1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1)
+IF(NOT TARDIS)
+  FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
 ENDIF()
 # No auto linking, so this option is useless anyway
 MARK_AS_ADVANCED(Boost_LIB_DIAGNOSTIC_DEFINITIONS)
-# Complain about incompatibilities
-IF(GCC_VERSION)
-  COMPARE_VERSION_STRINGS("${GCC_VERSION}" "4.4.0" _compare_result)
-  IF(NOT _compare_result LESS 0)
-    IF(${Boost_VERSION} LESS 103700)
-      MESSAGE(STATUS "Warning: Boost versions earlier than 1.37 may not compile with GCC 4.4 or later!")
-    ENDIF()
-  ENDIF()
-ENDIF()
 
 ##### OGRE #####
 FIND_PACKAGE(OGRE 1.6 REQUIRED)




More information about the Orxonox-commit mailing list