[Orxonox-commit 1073] r5794 - in code/trunk: cmake data src/modules/pong

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-09-26 17:28:40 +0200 (Sat, 26 Sep 2009)
New Revision: 5794

Modified:
   code/trunk/cmake/LibraryConfig.cmake
   code/trunk/data/CMakeLists.txt
   code/trunk/src/modules/pong/PongPrereqs.h
Log:
Small stuff and added support for Boost 1.40

Modified: code/trunk/cmake/LibraryConfig.cmake
===================================================================
--- code/trunk/cmake/LibraryConfig.cmake	2009-09-26 09:35:15 UTC (rev 5793)
+++ code/trunk/cmake/LibraryConfig.cmake	2009-09-26 15:28:40 UTC (rev 5794)
@@ -147,7 +147,7 @@
 
 ##### Boost #####
 # Expand the next statement if newer boost versions than 1.36.1 are released
-SET(Boost_ADDITIONAL_VERSIONS 1.37 1.37.0 1.38 1.38.0 1.39 1.39.0)
+SET(Boost_ADDITIONAL_VERSIONS 1.37 1.37.0 1.38 1.38.0 1.39 1.39.0 1.40 1.40.0)
 FIND_PACKAGE(Boost 1.35 REQUIRED thread filesystem system date_time)
 # No auto linking, so this option is useless anyway
 MARK_AS_ADVANCED(Boost_LIB_DIAGNOSTIC_DEFINITIONS)

Modified: code/trunk/data/CMakeLists.txt
===================================================================
--- code/trunk/data/CMakeLists.txt	2009-09-26 09:35:15 UTC (rev 5793)
+++ code/trunk/data/CMakeLists.txt	2009-09-26 15:28:40 UTC (rev 5794)
@@ -24,7 +24,7 @@
  #    Default search paths are: ../../data and ../data_extern
  #
 
-# For dev runs we've got two data directory. The one from the other repository root folder
+# For dev runs we've got two data directories. The one from the other repository root folder
 # is called EXTERNAL_DATA
 SET(DATA_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 SET(DATA_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)

Modified: code/trunk/src/modules/pong/PongPrereqs.h
===================================================================
--- code/trunk/src/modules/pong/PongPrereqs.h	2009-09-26 09:35:15 UTC (rev 5793)
+++ code/trunk/src/modules/pong/PongPrereqs.h	2009-09-26 15:28:40 UTC (rev 5794)
@@ -36,8 +36,6 @@
 
 #include "OrxonoxConfig.h"
 
-#include "pong/PongPrereqs.h"
-
 //-----------------------------------------------------------------------
 // Shared library settings
 //-----------------------------------------------------------------------