Changeset 8677 for code/branches

Timestamp:

May 30, 2011, 12:31:28 AM (14 years ago)

Author:

rgrieder

Message:

The COUNTER macro required for full build units was only added in GCC 4.3.
Warn the developer if using GCC < 4.3 and full build units.

Location:

code/branches/unity_build

Files:

• cmake/CompilerConfigGCC.cmake (modified) (1 diff)
• cmake/CompilerConfigMSVC.cmake (modified) (1 diff)
• src/OrxonoxConfig.cmake (modified) (1 diff)

code/branches/unity_build/cmake/CompilerConfigGCC.cmake

@@ -43 +43 @@
 IF(_compare_result GREATER -1)
   SET(PCH_COMPILER_SUPPORT TRUE)
+ENDIF()
+
+# __COUNTER__ macro was only added in GCC 4.3
+# It might be required to make full build units work
+COMPARE_VERSION_STRINGS("${GCC_VERSION}" "4.3.0" _compare_result)
+IF(_compare_result GREATER -1)
+  SET(HAVE_COUNTER_MACRO TRUE)
 ENDIF()
 

code/branches/unity_build/cmake/CompilerConfigMSVC.cmake

@@ -33 +33 @@
 # Orxonox only supports MSVC 8 and above, which gets asserted above
 SET(PCH_COMPILER_SUPPORT TRUE)
+
+# __COUNTER__ macro has been around since VS 2005
+# It might be required to make full build units work
+SET(HAVE_COUNTER_MACRO TRUE)
 
 

code/branches/unity_build/src/OrxonoxConfig.cmake

@@ -50 +50 @@
     ELSE()
       SET(NR_OF_BUILD_UNITS ${_nr_of_units})
+      IF(NOT HAVE_COUNTER_MACRO)
+        MESSAGE(WARNING "Your compiler doesn't support the __COUNTER__ macro. Full build units might not work!")
+      ENDIF()
     ENDIF()
   ENDIF()