Changeset 9673 for code

Timestamp:

Sep 25, 2013, 10:52:39 PM (11 years ago)

Author:

landauf

Message:

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

Location:

code/trunk/cmake

Files:

• CompilerConfigGCC.cmake (modified) (1 diff)
• LibraryConfigTardis.cmake (modified) (1 diff)

code/trunk/cmake/CompilerConfigGCC.cmake

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

code/trunk/cmake/LibraryConfigTardis.cmake

@@ -79 +79 @@
   #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)