Changeset 211 in flair-src for trunk/lib


Ignore:
Timestamp:
Jan 25, 2018, 11:44:15 AM (7 years ago)
Author:
Sanahuja Guillaume
Message:

change opencv include dir for testing new toolchain

Location:
trunk/lib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/lib/FlairCore/CMakeLists.txt

    r120 r211  
    2222INCLUDE_DIRECTORIES(
    2323        ${LIBXML2_INCLUDE_DIR}
    24         ${CMAKE_SYSROOT}/usr/include/opencv
     24        ${CMAKE_SYSROOT}/usr/include/opencv1
    2525        ${CMAKE_SYSROOT}/usr/include/udt
    2626        ${CMAKE_CURRENT_SOURCE_DIR}/src

  • trunk/lib/FlairCore/src/Map.cpp

    r137 r211  
    9999            this, "checkpoint", latitude, longitude, altitude);
    100100        checkpoints.push_back(checkpoint);
    101       } else if(isnan(latitude) || isnan(longitude)) {
     101      } else if(std::isnan(latitude) || std::isnan(longitude)) {
    102102        //delete checkpoint
    103103        removeCheckpoint(i);

  • trunk/lib/FlairFilter/CMakeLists.txt

    r45 r211  
    2424        ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported
    2525        ${CMAKE_CURRENT_SOURCE_DIR}/src/
    26         ${CMAKE_SYSROOT}/usr/include/opencv
     26        ${CMAKE_SYSROOT}/usr/include/opencv1
    2727        ${CMAKE_SYSROOT}/usr/include/iir
    2828)

  • trunk/lib/FlairMeta/CMakeLists.txt

    r45 r211  
    2525        ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported
    2626        ${CMAKE_CURRENT_SOURCE_DIR}/src/
    27         ${CMAKE_SYSROOT}/usr/include/opencv
     27        ${CMAKE_SYSROOT}/usr/include/opencv1
    2828)
    2929

  • trunk/lib/FlairSensorActuator/CMakeLists.txt

    r123 r211  
    2424        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairCore/src
    2525        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairVisionFilter/src
    26         ${CMAKE_SYSROOT}/usr/include/opencv
     26        ${CMAKE_SYSROOT}/usr/include/opencv1
    2727        ${CMAKE_SYSROOT}/usr/include/vrpn
    2828)

  • trunk/lib/FlairSimulator/CMakeLists.txt

    r45 r211  
    2525        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairSensorActuator/src
    2626        ${CMAKE_SYSROOT}/usr/include/vrpn
    27         ${CMAKE_SYSROOT}/usr/include/opencv
     27        ${CMAKE_SYSROOT}/usr/include/opencv1
    2828        ${CMAKE_SYSROOT}/usr/include/irrlicht
    2929)

  • trunk/lib/FlairVisionFilter/CMakeLists.txt

    r123 r211  
    2323        ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported
    2424        $ENV{FLAIR_ROOT}/flair-src/lib/FlairCore/src
    25         ${CMAKE_SYSROOT}/usr/include/opencv
     25        ${CMAKE_SYSROOT}/usr/include/opencv1
    2626)
    2727
Note: See TracChangeset for help on using the changeset viewer.