Changeset 302 in flair-src for trunk/demos/OpticalFlow/uav


Ignore:
Timestamp:
Feb 25, 2019, 4:28:34 PM (6 years ago)
Author:
Sanahuja Guillaume
Message:

modifs nouveau build system

Location:
trunk/demos/OpticalFlow/uav
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/demos/OpticalFlow/uav/CMakeLists.txt

    r301 r302  
    11PROJECT(OpticalFlow)
    22cmake_minimum_required(VERSION 2.8)
    3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     3include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    44
    55if(NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")
    66
    7 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    87SET(FLAIR_USE_FILTER TRUE)
    98SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
    109SET(FLAIR_USE_VISION_FILTER TRUE)
    1110SET(FLAIR_USE_META TRUE)
    12 SET(COPY_RESOURCE_FILES true)
    13 
    14 include(${FLAIR_USE_FILE})
    1511
    1612SET(SRC_FILES
    … …  
    1915)
    2016
    21 INCLUDE_DIRECTORIES(
    22         ${FLAIR_INCLUDE_DIR}
    23 )
    24 
    25 #real time executable
    26 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    27         ${SRC_FILES}
    28 )
    29 
    30 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    31 
    32 #non real time executable
    33 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    34         ${SRC_FILES}
    35 )
    36 
    37 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    38 
    39 INSTALL(
    40         TARGETS ${PROJECT_NAME}_rt
    41         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    42 )
    43 
    44 INSTALL(
    45         TARGETS ${PROJECT_NAME}_nrt
    46         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
     17FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     18           DEST_DIR OpticalFlow
     19           COPY_RESOURCES
    4720)
    4821

  • trunk/demos/OpticalFlow/uav/resources/core2-64/x4.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu -v dsp_stub

  • trunk/demos/OpticalFlow/uav/resources/core2-64/x8.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x8.xml -t x8_simu -v dsp_stub
Note: See TracChangeset for help on using the changeset viewer.