[Orxonox-commit 2815] r7518 - code/branches/ois_update/cmake

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-10-09 17:28:36 +0200 (Sat, 09 Oct 2010)
New Revision: 7518

Modified:
   code/branches/ois_update/cmake/CompilerConfigGCC.cmake
   code/branches/ois_update/cmake/LibraryConfig.cmake
Log:
There was a hidden problem with the recent "radical change" after all.
Fixed it.

Modified: code/branches/ois_update/cmake/CompilerConfigGCC.cmake
===================================================================
--- code/branches/ois_update/cmake/CompilerConfigGCC.cmake	2010-10-09 15:24:44 UTC (rev 7517)
+++ code/branches/ois_update/cmake/CompilerConfigGCC.cmake	2010-10-09 15:28:36 UTC (rev 7518)
@@ -36,14 +36,6 @@
   OUTPUT_VARIABLE GCC_VERSION
 )
 
-# Complain about incompatibilities
-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()
-
 # GCC may not support #pragma GCC system_header correctly when using
 # templates. According to Bugzilla, it was fixed March 07 but tests
 # have confirmed that GCC 4.0.0 does not pose a problem for our cases.

Modified: code/branches/ois_update/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/ois_update/cmake/LibraryConfig.cmake	2010-10-09 15:24:44 UTC (rev 7517)
+++ code/branches/ois_update/cmake/LibraryConfig.cmake	2010-10-09 15:28:36 UTC (rev 7518)
@@ -166,6 +166,13 @@
 ENDIF()
 # No auto linking, so this option is useless anyway
 MARK_AS_ADVANCED(Boost_LIB_DIAGNOSTIC_DEFINITIONS)
+# Complain about incompatibilities
+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()
 
 
 ####### Static/Dynamic linking options ##########