[Orxonox-commit 3655] r8340 - in code/branches/kicklib2: cmake src/libraries/util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-04-26 22:50:18 +0200 (Tue, 26 Apr 2011)
New Revision: 8340

Modified:
   code/branches/kicklib2/cmake/CompilerConfigGCC.cmake
   code/branches/kicklib2/src/libraries/util/CMakeLists.txt
Log:
Remove some extra code that removes warnings in older GCC versions (< 4.0) that nobody uses anymore.

Modified: code/branches/kicklib2/cmake/CompilerConfigGCC.cmake
===================================================================
--- code/branches/kicklib2/cmake/CompilerConfigGCC.cmake	2011-04-26 20:39:56 UTC (rev 8339)
+++ code/branches/kicklib2/cmake/CompilerConfigGCC.cmake	2011-04-26 20:50:18 UTC (rev 8340)
@@ -37,14 +37,6 @@
   OUTPUT_VARIABLE GCC_VERSION
 )
 
-# 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.
-COMPARE_VERSION_STRINGS("${GCC_VERSION}" "4.0.0" _compare_result)
-IF(_compare_result LESS 0)
-  SET(GCC_NO_SYSTEM_HEADER_SUPPORT TRUE)
-ENDIF()
-
 # GCC only supports PCH in versions 3.4 and above
 INCLUDE(CompareVersionStrings)
 COMPARE_VERSION_STRINGS("${GCC_VERSION}" "3.4.0" _compare_result)
@@ -93,10 +85,6 @@
 # We have some unconformant code, disable an optimisation feature
 ADD_COMPILER_FLAGS("-fno-strict-aliasing" CACHE)
 
-# For GCC older than version 4, do not display sign compare warnings
-# because of boost::filesystem (which creates about a hundred per include)
-ADD_COMPILER_FLAGS("-Wno-sign-compare" GCC_NO_SYSTEM_HEADER_SUPPORT CACHE)
-
 # For newer GCC (4.3 and above), don't display hundreds of annoying deprecated
 # messages. Other versions don't seem to show any such warnings at all.
 ADD_COMPILER_FLAGS("-Wno-deprecated" CXX CACHE)

Modified: code/branches/kicklib2/src/libraries/util/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/src/libraries/util/CMakeLists.txt	2011-04-26 20:39:56 UTC (rev 8339)
+++ code/branches/kicklib2/src/libraries/util/CMakeLists.txt	2011-04-26 20:50:18 UTC (rev 8340)
@@ -39,10 +39,6 @@
 COMPILATION_END
 )
 
-IF(GCC_NO_SYSTEM_HEADER_SUPPORT)
-  # Get around displaying a few hundred lines of warning code
-  SET_SOURCE_FILES_PROPERTIES(MultiType.cc PROPERTIES COMPILE_FLAGS "-w")
-ENDIF()
 IF(MSVC)
   # Simply using #pragma warning(disable:4244) doesn't really disable it
   # if the warning occurs in a template in another file