Changeset 9077

Timestamp:

Apr 1, 2012, 6:48:06 PM (13 years ago)

Author:

landauf

Message:

reverted changes of r9020 in LibraryConfig.cmake
fixed warning in Math.h
added include directories for tests
fixed runtime path in CTestCustom.cmake

Location:

code/branches/testing

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• src/libraries/util/Math.h (modified) (2 diffs)
• test/CMakeLists.txt (modified) (1 diff)
• test/CTestCustom.cmake (modified) (1 diff)

code/branches/testing/cmake/LibraryConfig.cmake

@@ -162 +162 @@
                               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()

code/branches/testing/src/libraries/util/Math.h

@@ -238 +238 @@
     inline T interpolate(float time, const T& start, const T& end)
     {
-        return time * (end - start) + start;
+        return static_cast<T>(time * (end - start) + start);
     }
 
@@ -251 +251 @@
     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);
     }
 

code/branches/testing/test/CMakeLists.txt

@@ -47 +47 @@
 
 INCLUDE_DIRECTORIES(
+  ../src/external
   ../src/libraries
   ../src/orxonox
   ../src/modules
   ${CMAKE_BINARY_DIR}/src
+  ${Boost_INCLUDE_DIRS}
   ${OGRE_INCLUDE_DIR}
   ${POCO_INCLUDE_DIR}

code/branches/testing/test/CTestCustom.cmake

@@ -1 @@
-SET(ENV{PATH} "@CMAKE_LIBRARY_PATH@;$ENV{PATH}")
+SET(ENV{PATH} "@RUNTIME_LIBRARY_DIRECTORY@;$ENV{PATH}")