Ignore:
Timestamp:
Oct 18, 2016, 9:13:08 AM (5 years ago)
Author:
Bayard Gildas
Message:

Passage du "framework" à flair

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/PidStandalone/uav/CMakeLists.txt

    r44 r105  
    33
    44SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    5 SET(FRAMEWORK_USE_FILTER TRUE)
    6 SET(FRAMEWORK_USE_SENSOR_ACTUATOR TRUE)
    7 SET(FRAMEWORK_USE_META TRUE)
    8 SET(FRAMEWORK_USE_OPTITRACK TRUE)
     5SET(FLAIR_USE_FILTER TRUE)
     6SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     7SET(FLAIR_USE_META TRUE)
     8SET(FLAIR_USE_VRPN TRUE)
    99
    10 include($ENV{IGEP_ROOT}/uav_dev/cmake_modules/GlobalCmakeUAV.cmake)
    11 include(${FRAMEWORK_USE_FILE})
     10include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     11include(${FLAIR_USE_FILE})
    1212
    1313SET(SRC_FILES
     
    1616)
    1717
    18 LINK_DIRECTORIES (
    19         ${FRAMEWORK_LIBRARY_DIR}
    20 )
    21 
    2218INCLUDE_DIRECTORIES(
    23         ${FRAMEWORK_INCLUDE_DIR}
     19        ${FLAIR_INCLUDE_DIR}
    2420)
    2521
     
    2925)
    3026
    31 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FRAMEWORK_LIBRARIES_RT})
     27TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    3228
    3329#non real time executable
     
    3632)
    3733
    38 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FRAMEWORK_LIBRARIES_NRT})
     34TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
Note: See TracChangeset for help on using the changeset viewer.