[Orxonox-commit 187] r2862 - branches/gui/cmake

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-03-29 22:14:36 +0000 (Sun, 29 Mar 2009)
New Revision: 2862

Modified:
   branches/gui/cmake/BuildConfig.cmake
   branches/gui/cmake/BuildConfigGCC.cmake
Log:
quote: "Fixed some bugs. Please do not break the code, when working with other people on one branch"
Me too. CMake wasn't even able to make the project after r2853!
The problem was the no -Wno-deprecated flag, which was set to all compilers.
Lets examine: There are three files with compiler settings: BuildConfig.cmake, BuildConfigGCC.cmake and BuildConfigMSVC.cmake. Suppose you want to apply a GCC specific option, which one do you pick? BuildConfig.cmake, exactly, because that only concerns GCC in contrast to BuildConfigGCC.cmake!
I still hope the dozens if not hundreds of hours of work spent on the build system to make it less of a mess weren't all that in vein...

- Also re enabled the OPTION to show extended compiler warnings and explicitly set it to false (which it was before, just not visibly).

Modified: branches/gui/cmake/BuildConfig.cmake
===================================================================
--- branches/gui/cmake/BuildConfig.cmake	2009-03-28 22:19:06 UTC (rev 2861)
+++ branches/gui/cmake/BuildConfig.cmake	2009-03-29 22:14:36 UTC (rev 2862)
@@ -89,7 +89,7 @@
 
 ################ Compiler Config ################
 
-#OPTION(EXTRA_COMPILER_WARNINGS "Enable some extra warnings (heavily pollutes the output)")
+OPTION(EXTRA_COMPILER_WARNINGS "Enable some extra warnings (heavily pollutes the output)" FALSE)
 
 INCLUDE(FlagUtilities)
 
@@ -183,7 +183,6 @@
 
 # Disable Boost auto linking completely
 ADD_COMPILER_FLAGS("-DBOOST_ALL_NO_LIB")
-ADD_COMPILER_FLAGS("-Wno-deprecated")
 
 # If no defines are specified, these libs get linked statically
 ADD_COMPILER_FLAGS("-DBOOST_ALL_DYN_LINK" WIN32 LINK_BOOST_DYNAMIC)

Modified: branches/gui/cmake/BuildConfigGCC.cmake
===================================================================
--- branches/gui/cmake/BuildConfigGCC.cmake	2009-03-28 22:19:06 UTC (rev 2861)
+++ branches/gui/cmake/BuildConfigGCC.cmake	2009-03-29 22:14:36 UTC (rev 2862)
@@ -62,6 +62,10 @@
 # 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")
+
 # Increase warning level if requested
 IF(EXTRA_COMPILER_WARNINGS)
   REMOVE_COMPILER_FLAGS("-Wall" CACHE)