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


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

modifs nouveau build system

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

Legend:

Unmodified
Added
Removed

  • trunk/demos/SimpleFleet/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 SimpleFleet
     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/SimpleFleet/uav/resources/core2-64/x8_0.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_simu0 -b 127.255.255.255:20010

  • trunk/demos/SimpleFleet/uav/resources/core2-64/x8_1.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_1 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu1 -b 127.255.255.255:20010 -d 21000
Note: See TracChangeset for help on using the changeset viewer.