[Orxonox-commit 5007] r9673 - code/trunk/cmake

[landauf at orxonox.net]

Author: landauf
Date: 2013-09-25 22:52:39 +0200 (Wed, 25 Sep 2013)
New Revision: 9673

Modified:
   code/trunk/cmake/CompilerConfigGCC.cmake
   code/trunk/cmake/LibraryConfigTardis.cmake
Log:
moved workaround for old boost versions to LibraryConfigTardis.cmake - I hope all normal distributions have newer versions of boost and the workaround causes trouble on windows with MinGW

Modified: code/trunk/cmake/CompilerConfigGCC.cmake
===================================================================
--- code/trunk/cmake/CompilerConfigGCC.cmake	2013-09-17 11:40:31 UTC (rev 9672)
+++ code/trunk/cmake/CompilerConfigGCC.cmake	2013-09-25 20:52:39 UTC (rev 9673)
@@ -123,10 +123,3 @@
 
   ADD_LINKER_FLAGS("-enable-auto-import" CACHE)
 ENDIF()
-
-
-# Sandro fix: add flag that re-enables boost threads. This makes the combination
-#             of GCC version > 4.7 and older libboost work. See 
-# http://stackoverflow.com/questions/5389853/doesnt-compile-if-included-boost-thread-in-linux-ubuntu10-10
-#             for more information.
-ADD_COMPILER_FLAGS("-D_GLIBCXX__PTHREADS=1" CXX CACHE)

Modified: code/trunk/cmake/LibraryConfigTardis.cmake
===================================================================
--- code/trunk/cmake/LibraryConfigTardis.cmake	2013-09-17 11:40:31 UTC (rev 9672)
+++ code/trunk/cmake/LibraryConfigTardis.cmake	2013-09-25 20:52:39 UTC (rev 9673)
@@ -78,4 +78,11 @@
   #SET(ENV{OGRE_HOME}   "/usr/pack/ogre-1.4.9-sd;/usr/pack/ogre-1.4.9-sd/i686-debian-linux4.0")
   #SET(ENV{OPENALDIR}   "/usr/pack/openal-0.0.8-cl;/usr/pack/openal-0.0.8-cl/i686-debian-linux3.1")
   #SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include")
+
+
+  # Sandro fix: add flag that re-enables boost threads. This makes the combination
+  #             of GCC version > 4.7 and older libboost work. See 
+  # http://stackoverflow.com/questions/5389853/doesnt-compile-if-included-boost-thread-in-linux-ubuntu10-10
+  #             for more information.
+  ADD_COMPILER_FLAGS("-D_GLIBCXX__PTHREADS=1" CXX CACHE)
 ENDIF(TARDIS)