Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9077


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/testing/cmake/LibraryConfig.cmake

    r9020 r9077  
    162162                              1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1)
    163163IF(NOT TARDIS)
    164   # optional
    165   FIND_PACKAGE(Boost 1.40 COMPONENTS unit_test_framework)
    166   # required
    167164  FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
    168165ENDIF()
  • code/branches/testing/src/libraries/util/Math.h

    r9026 r9077  
    238238    inline T interpolate(float time, const T& start, const T& end)
    239239    {
    240         return time * (end - start) + start;
     240        return static_cast<T>(time * (end - start) + start);
    241241    }
    242242
     
    251251    inline T interpolateSmooth(float time, const T& start, const T& end)
    252252    {
    253         return (-2 * (end - start) * cube(time)) + (3 * (end - start) * square(time)) + start;
     253        return static_cast<T>((-2 * (end - start) * cube(time)) + (3 * (end - start) * square(time)) + start);
    254254    }
    255255
  • code/branches/testing/test/CMakeLists.txt

    r9025 r9077  
    4747
    4848INCLUDE_DIRECTORIES(
     49  ../src/external
    4950  ../src/libraries
    5051  ../src/orxonox
    5152  ../src/modules
    5253  ${CMAKE_BINARY_DIR}/src
     54  ${Boost_INCLUDE_DIRS}
    5355  ${OGRE_INCLUDE_DIR}
    5456  ${POCO_INCLUDE_DIR}
  • code/branches/testing/test/CTestCustom.cmake

    r9025 r9077  
    1 SET(ENV{PATH} "@CMAKE_LIBRARY_PATH@;$ENV{PATH}")
     1SET(ENV{PATH} "@RUNTIME_LIBRARY_DIRECTORY@;$ENV{PATH}")
Note: See TracChangeset for help on using the changeset viewer.