Changeset 3161

Timestamp:

Jun 13, 2009, 11:29:15 PM (15 years ago)

Author:

rgrieder

Message:

Workaround for GCC < 4.2.0 to avoid a bug

Location:

code/branches/pch

Files:

• cmake/BuildConfigGCC.cmake (modified) (1 diff)
• cmake/GetGCCCompilerFlags.cmake (modified) (1 diff)
• src/core/CorePrecompiledHeaders.h (modified) (1 diff)

code/branches/pch/cmake/BuildConfigGCC.cmake

@@ -77 +77 @@
 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)

code/branches/pch/cmake/GetGCCCompilerFlags.cmake

@@ -42 +42 @@
 
   # 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

code/branches/pch/src/core/CorePrecompiledHeaders.h

@@ -58 +58 @@
 #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"