Changeset 23 in flair-src for trunk/demos/CircleFollower/simulator


Ignore:
Timestamp:
04/20/16 17:07:36 (6 years ago)
Author:
Sanahuja Guillaume
Message:

igep to flair

Location:
trunk/demos/CircleFollower/simulator
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/CircleFollower/simulator/CMakeLists.txt

    r21 r23  
    33
    44SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    5 SET(FRAMEWORK_USE_SIMULATOR TRUE)
    6 SET(FRAMEWORK_USE_SIMULATOR_GL TRUE)
     5SET(FLAIR_USE_SIMULATOR TRUE)
     6SET(FLAIR_USE_SIMULATOR_GL TRUE)
    77
    8 include($ENV{IGEP_ROOT}/uav_dev/cmake_modules/GlobalCmakeUAV.cmake)
    9 include(${FRAMEWORK_USE_FILE})
     8include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     9include(${FLAIR_USE_FILE})
    1010
    1111SET(SRC_FILES
     
    1414
    1515LINK_DIRECTORIES (
    16         ${FRAMEWORK_LIBRARY_DIR}
     16        ${FLAIR_LIBRARY_DIR}
    1717)
    1818
    1919INCLUDE_DIRECTORIES(
    20         ${FRAMEWORK_INCLUDE_DIR}
     20        ${FLAIR_INCLUDE_DIR}
    2121)
    2222
     
    2626)
    2727
    28 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FRAMEWORK_LIBRARIES_RT})
     28TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    2929
    3030#non real time executable
     
    3333)
    3434
    35 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FRAMEWORK_LIBRARIES_NRT})
     35TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
  • trunk/demos/CircleFollower/simulator/src/main.cpp

    r21 r23  
    2727using namespace TCLAP;
    2828using namespace std;
    29 using namespace framework::simulator;
    30 using namespace framework::sensor;
     29using namespace flair::simulator;
     30using namespace flair::sensor;
    3131
    3232int port;
Note: See TracChangeset for help on using the changeset viewer.