Changeset 302 in flair-src for trunk/demos/CircleFollower


Ignore:
Timestamp:
02/25/19 16:28:34 (4 years ago)
Author:
Sanahuja Guillaume
Message:

modifs nouveau build system

Location:
trunk/demos/CircleFollower
Files:
6 edited

Legend:

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

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_SIMULATOR TRUE)
    65SET(FLAIR_USE_SIMULATOR_GL TRUE)
    7 SET(COPY_RESOURCE_FILES true)
    86
    9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    10 include(${FLAIR_USE_FILE})
     7include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    118
    129SET(SRC_FILES
     
    1411)
    1512
    16 INCLUDE_DIRECTORIES(
    17         ${FLAIR_INCLUDE_DIR}
     13FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     14           DEST_DIR CircleFollower
     15           COPY_RESOURCES
    1816)
    19 
    20 #real time executable
    21 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    22         ${SRC_FILES}
    23 )
    24 
    25 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    26 
    27 #non real time executable
    28 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    29         ${SRC_FILES}
    30 )
    31 
    32 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    33 
    34 INSTALL(
    35         TARGETS ${PROJECT_NAME}_rt
    36         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    37 )
    38 
    39 INSTALL(
    40         TARGETS ${PROJECT_NAME}_nrt
    41         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    42 )
  • trunk/demos/CircleFollower/simulator/resources/core2-64/simulator_x4.sh

    r301 r302  
    66fi
    77
    8 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     8. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    99
    10 $EXEC -n x4_0 -t x4 -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
     10$EXEC -n x4_0 -t x4 -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/CircleFollower/simulator/resources/core2-64/simulator_x8.sh

    r301 r302  
    11#! /bin/bash
    22
    3 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     3. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    44
    55if [ -f /proc/xenomai/version ];then
     
    99fi
    1010
    11 $EXEC -n x8_0 -t x8 -p 9000 -a 127.0.0.1 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
     11$EXEC -n x8_0 -t x8 -p 9000 -a 127.0.0.1 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/CircleFollower/uav/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_FILTER TRUE)
    65SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     
    87SET(FLAIR_USE_META TRUE)
    98SET(FLAIR_USE_VRPN TRUE)
    10 SET(COPY_RESOURCE_FILES true)
    119
    12 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    13 include(${FLAIR_USE_FILE})
     10include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    1411
    1512SET(SRC_FILES
     
    1815)
    1916
    20 INCLUDE_DIRECTORIES(
    21         ${FLAIR_INCLUDE_DIR}
     17FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     18           DEST_DIR CircleFollower
     19           COPY_RESOURCES
    2220)
    23 
    24 #real time executable
    25 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    26         ${SRC_FILES}
    27 )
    28 
    29 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    30 
    31 #non real time executable
    32 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    33         ${SRC_FILES}
    34 )
    35 
    36 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    37 
    38 INSTALL(
    39         TARGETS ${PROJECT_NAME}_rt
    40         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    41 )
    42 
    43 INSTALL(
    44         TARGETS ${PROJECT_NAME}_nrt
    45         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    46 )
  • trunk/demos/CircleFollower/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
  • trunk/demos/CircleFollower/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 ./ -x setup_x8.xml -t x8_simu
Note: See TracChangeset for help on using the changeset viewer.