[Orxonox-commit 4406] r9077 - in code/branches/testing: cmake src/libraries/util test

[landauf at orxonox.net]

Author: landauf
Date: 2012-04-01 18:48:06 +0200 (Sun, 01 Apr 2012)
New Revision: 9077

Modified:
   code/branches/testing/cmake/LibraryConfig.cmake
   code/branches/testing/src/libraries/util/Math.h
   code/branches/testing/test/CMakeLists.txt
   code/branches/testing/test/CTestCustom.cmake
Log:
reverted changes of r9020 in LibraryConfig.cmake
fixed warning in Math.h
added include directories for tests
fixed runtime path in CTestCustom.cmake

Modified: code/branches/testing/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/testing/cmake/LibraryConfig.cmake	2012-04-01 09:07:02 UTC (rev 9076)
+++ code/branches/testing/cmake/LibraryConfig.cmake	2012-04-01 16:48:06 UTC (rev 9077)
@@ -161,9 +161,6 @@
 SET(Boost_ADDITIONAL_VERSIONS 1.40 1.40.0 1.41 1.41.0 1.42 1.42.0 1.43 1.43.0
                               1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1)
 IF(NOT TARDIS)
-  # optional
-  FIND_PACKAGE(Boost 1.40 COMPONENTS unit_test_framework)
-  # required
   FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
 ENDIF()
 # No auto linking, so this option is useless anyway

Modified: code/branches/testing/src/libraries/util/Math.h
===================================================================
--- code/branches/testing/src/libraries/util/Math.h	2012-04-01 09:07:02 UTC (rev 9076)
+++ code/branches/testing/src/libraries/util/Math.h	2012-04-01 16:48:06 UTC (rev 9077)
@@ -237,7 +237,7 @@
     template <typename T>
     inline T interpolate(float time, const T& start, const T& end)
     {
-        return time * (end - start) + start;
+        return static_cast<T>(time * (end - start) + start);
     }
 
     /**
@@ -250,7 +250,7 @@
     template <typename T>
     inline T interpolateSmooth(float time, const T& start, const T& end)
     {
-        return (-2 * (end - start) * cube(time)) + (3 * (end - start) * square(time)) + start;
+        return static_cast<T>((-2 * (end - start) * cube(time)) + (3 * (end - start) * square(time)) + start);
     }
 
     /**

Modified: code/branches/testing/test/CMakeLists.txt
===================================================================
--- code/branches/testing/test/CMakeLists.txt	2012-04-01 09:07:02 UTC (rev 9076)
+++ code/branches/testing/test/CMakeLists.txt	2012-04-01 16:48:06 UTC (rev 9077)
@@ -46,10 +46,12 @@
 CONFIGURE_FILE("CTestCustom.cmake" "CTestCustom.cmake" @ONLY)
 
 INCLUDE_DIRECTORIES(
+  ../src/external
   ../src/libraries
   ../src/orxonox
   ../src/modules
   ${CMAKE_BINARY_DIR}/src
+  ${Boost_INCLUDE_DIRS}
   ${OGRE_INCLUDE_DIR}
   ${POCO_INCLUDE_DIR}
 )

Modified: code/branches/testing/test/CTestCustom.cmake
===================================================================
--- code/branches/testing/test/CTestCustom.cmake	2012-04-01 09:07:02 UTC (rev 9076)
+++ code/branches/testing/test/CTestCustom.cmake	2012-04-01 16:48:06 UTC (rev 9077)
@@ -1 +1 @@
-SET(ENV{PATH} "@CMAKE_LIBRARY_PATH@;$ENV{PATH}")
+SET(ENV{PATH} "@RUNTIME_LIBRARY_DIRECTORY@;$ENV{PATH}")