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


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

modifs nouveau build system

Location:
trunk/demos/PidStandalone
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/PidStandalone/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})
    11 
     7include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    128
    139SET(SRC_FILES
     
    1511)
    1612
    17 INCLUDE_DIRECTORIES(
    18         ${FLAIR_INCLUDE_DIR}
     13FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     14           DEST_DIR PidStandalone
     15           COPY_RESOURCES
    1916)
    20 
    21 #real time executable
    22 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    23         ${SRC_FILES}
    24 )
    25 
    26 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    27 
    28 #non real time executable
    29 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    30         ${SRC_FILES}
    31 )
    32 
    33 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    34 
    35 INSTALL(
    36         TARGETS ${PROJECT_NAME}_rt
    37         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    38 )
    39 
    40 INSTALL(
    41         TARGETS ${PROJECT_NAME}_nrt
    42         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    43 )
    44 
  • trunk/demos/PidStandalone/simulator/resources/core2-64/simulator_x4.sh

    r301 r302  
    77fi
    88
    9 . $IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    11 $EXEC -n x4_0 -t x4 -a 127.0.0.1 -p 9000 -x simulator_x4.xml -o 10 -m $IGEP_ROOT/uav_dev/media -s $IGEP_ROOT/uav_dev/media/optitrack_b122.xml
     11$EXEC -n x4_0 -t x4 -a 127.0.0.1 -p 9000 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/PidStandalone/simulator/resources/core2-64/simulator_x8.sh

    r301 r302  
    77fi
    88
    9 . $IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    11 $EXEC  -n x8_0 -t x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $IGEP_ROOT/uav_dev/media -s $IGEP_ROOT/uav_dev/media/optitrack_b122.xml
     11$EXEC  -n x8_0 -t x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/PidStandalone/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)
    76SET(FLAIR_USE_VISION_FILTER TRUE)
    87SET(FLAIR_USE_META TRUE)
    9 SET(COPY_RESOURCE_FILES true)
    108
    11 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    12 include(${FLAIR_USE_FILE})
     9include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    1310
    1411SET(SRC_FILES
     
    1714)
    1815
    19 INCLUDE_DIRECTORIES(
    20         ${FLAIR_INCLUDE_DIR}
     16FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     17           DEST_DIR PidStandalone
     18           COPY_RESOURCES
    2119)
    22 
    23 #real time executable
    24 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    25         ${SRC_FILES}
    26 )
    27 
    28 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    29 
    30 #non real time executable
    31 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    32         ${SRC_FILES}
    33 )
    34 
    35 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    36 
    37 INSTALL(
    38         TARGETS ${PROJECT_NAME}_rt
    39         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    40 )
    41 
    42 INSTALL(
    43         TARGETS ${PROJECT_NAME}_nrt
    44         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    45 )
  • trunk/demos/PidStandalone/uav/resources/core2-64/x4.sh

    r301 r302  
    66fi
    77
    8 . $IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh
     8. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    99
    1010$EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x4.xml -t x4_simu $*
  • trunk/demos/PidStandalone/uav/resources/core2-64/x8.sh

    r301 r302  
    77fi
    88
    9 . $IGEP_ROOT/uav_dev/bin/noarch/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.