Changeset 2638

Timestamp:

Feb 7, 2009, 8:03:27 PM (16 years ago)

Author:

rgrieder

Message:

Removed about a thousand lines of warnings when compiling with GCC 3. It's not such a clean workaround but better than polluted output.

Location:

code/branches/buildsystem2

Files:

• cmake/BuildConfigGCC.cmake (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/util/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem2/cmake/BuildConfigGCC.cmake

@@ -23 +23 @@
  #    Sets the right compiler and linker flags for GCC.
  #
+
+# Determine compiler version
+EXEC_PROGRAM(
+  ${CMAKE_CXX_COMPILER}
+  ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+  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.
+INCLUDE(CompareVersionStrings)
+COMPARE_VERSION_STRINGS("${GCC_VERSION}" "4.0.0" _compare_result)
+IF(NOT _compare_result LESS 0)
+  SET(GCC_SYSTEM_HEADER_SUPPORT TRUE)
+ENDIF()
 
 # Also include environment flags. Could cause conflicts though

code/branches/buildsystem2/src/core/CMakeLists.txt

@@ -68 +68 @@
 GENERATE_TOLUA_BINDINGS(Core CORE_FILES INPUTFILES LuaBind.h CommandExecutor.h)
 
+IF(NOT GCC_SYSTEM_HEADER_SUPPORT)
+  # Get around displaying a few hundred lines of warning code
+  SET_SOURCE_FILES_PROPERTIES(ArgumentCompletionFunctions.cc PROPERTIES COMPILE_FLAGS "-w")
+ENDIF()
+
 ADD_LIBRARY(core SHARED ${CORE_FILES})
 

code/branches/buildsystem2/src/orxonox/CMakeLists.txt

@@ -39 +39 @@
 # Not using precompiled header files: Avoid dependencies
 INCLUDE_DIRECTORIES(pch/nopch)
+
+IF(NOT GCC_SYSTEM_HEADER_SUPPORT)
+  # Get around displaying a few hundred lines of warning code
+  SET_SOURCE_FILES_PROPERTIES(gamestates/GSGraphics.cc PROPERTIES COMPILE_FLAGS "-w")
+ENDIF()
 
 ADD_EXECUTABLE(orxonox ${ORXONOX_FILES})

code/branches/buildsystem2/src/util/CMakeLists.txt

@@ -58 +58 @@
 SOURCE_GROUP("" FILES ${CMAKE_BINARY_DIR}/src/OrxonoxConfig.h)
 
+IF(NOT GCC_SYSTEM_HEADER_SUPPORT)
+  # Get around displaying a few hundred lines of warning code
+  SET_SOURCE_FILES_PROPERTIES(MultiType.cc PROPERTIES COMPILE_FLAGS "-w")
+ENDIF()
+
 ADD_LIBRARY(util SHARED ${UTIL_FILES})
 SET_TARGET_PROPERTIES(util PROPERTIES DEFINE_SYMBOL "UTIL_SHARED_BUILD")