[Orxonox-commit 629] r3161 - in branches/pch: cmake src/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-06-13 23:29:15 +0200 (Sat, 13 Jun 2009)
New Revision: 3161

Modified:
   branches/pch/cmake/BuildConfigGCC.cmake
   branches/pch/cmake/GetGCCCompilerFlags.cmake
   branches/pch/src/core/CorePrecompiledHeaders.h
Log:
Workaround for GCC < 4.2.0 to avoid a bug

Modified: branches/pch/cmake/BuildConfigGCC.cmake
===================================================================
--- branches/pch/cmake/BuildConfigGCC.cmake	2009-06-13 20:24:14 UTC (rev 3160)
+++ branches/pch/cmake/BuildConfigGCC.cmake	2009-06-13 21:29:15 UTC (rev 3161)
@@ -76,6 +76,9 @@
 # messages. Other versions don't seem to show any such warnings at all.
 ADD_COMPILER_FLAGS("-Wno-deprecated" CXX CACHE)
 
+# Always show why a precompiled header file could not be used
+ADD_COMPILER_FLAGS("-Winvalid-pch" CXX CACHE)
+
 # Increase warning level if requested
 IF(EXTRA_COMPILER_WARNINGS)
   ADD_COMPILER_FLAGS("-Wall -Wextra -Wno-unused-parameter" CACHE)

Modified: branches/pch/cmake/GetGCCCompilerFlags.cmake
===================================================================
--- branches/pch/cmake/GetGCCCompilerFlags.cmake	2009-06-13 20:24:14 UTC (rev 3160)
+++ branches/pch/cmake/GetGCCCompilerFlags.cmake	2009-06-13 21:29:15 UTC (rev 3161)
@@ -41,10 +41,10 @@
   ENDIF()
 
   # For shared libraries linked with gcc, we have to add -fPIC
-  #GET_TARGET_PROPERTY(_target_type ${_target} TYPE)
-  #IF(${_target_type} STREQUAL SHARED_LIBRARY)
-  #  SET(_flag_str "${_flag_str} -fPIC")
-  #ENDIF()
+  GET_TARGET_PROPERTY(_target_type ${_target} TYPE)
+  IF(NOT MINGW AND ${_target_type} STREQUAL SHARED_LIBRARY)
+    SET(_flag_str "${_flag_str} -fPIC")
+  ENDIF()
 
   # Target compile flags
   GET_TARGET_PROPERTY(_target_flags ${_target} COMPILE_FLAGS)

Modified: branches/pch/src/core/CorePrecompiledHeaders.h
===================================================================
--- branches/pch/src/core/CorePrecompiledHeaders.h	2009-06-13 20:24:14 UTC (rev 3160)
+++ branches/pch/src/core/CorePrecompiledHeaders.h	2009-06-13 21:29:15 UTC (rev 3161)
@@ -57,7 +57,10 @@
 #include <ois/OISJoyStick.h>
 #include <tinyxml/ticpp.h>
 
-#include "util/Convert.h"
+// GCC may have problems with anonymous namespaces in certain situations
+#if !(defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 420))
+#  include "util/Convert.h"
+#endif
 #include "util/Debug.h"
 #include "util/Exception.h"
 #include "util/Math.h"