Changeset 299 in flair-src


Ignore:
Timestamp:
Jan 30, 2019, 4:53:24 PM (21 months ago)
Author:
Sanahuja Guillaume
Message:

cleanup for out of source build

Location:
trunk/demos
Files:
9 added
52 deleted
16 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/CMakeLists.txt

    r297 r299  
    88add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/MixedReality/)
    99add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/OpticalFlow/)
     10add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/PidStandalone/)
    1011add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/SimpleFleet/)
    1112add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Sinus/)
  • trunk/demos/CircleFollower/simulator/CMakeLists.txt

    r297 r299  
    3030
    3131TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     32
     33INSTALL(
     34        TARGETS ${PROJECT_NAME}_rt
     35        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/CircleFollower
     36)
     37
     38INSTALL(
     39        TARGETS ${PROJECT_NAME}_nrt
     40        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/CircleFollower
     41)
  • trunk/demos/CircleFollower/uav/CMakeLists.txt

    r297 r299  
    3434
    3535TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     36
     37INSTALL(
     38        TARGETS ${PROJECT_NAME}_rt
     39        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/CircleFollower
     40)
     41
     42INSTALL(
     43        TARGETS ${PROJECT_NAME}_nrt
     44        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/CircleFollower
     45)
  • trunk/demos/Gps/simulator/CMakeLists.txt

    r297 r299  
    3030
    3131TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT} nmea)
     32
     33INSTALL(
     34        TARGETS ${PROJECT_NAME}_rt
     35        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/Gps
     36)
     37
     38INSTALL(
     39        TARGETS ${PROJECT_NAME}_nrt
     40        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/Gps
     41)
  • trunk/demos/Gps/uav/CMakeLists.txt

    r297 r299  
    3434
    3535TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     36
     37INSTALL(
     38        TARGETS ${PROJECT_NAME}_rt
     39        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/Gps
     40)
     41
     42INSTALL(
     43        TARGETS ${PROJECT_NAME}_nrt
     44        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/Gps
     45)
  • trunk/demos/HelloWorld/CMakeLists.txt

    r13 r299  
    1313    COMMAND scp bin/${PROJECT_NAME} root@192.168.6.1:/home/root/
    1414)
     15
     16INSTALL(
     17        TARGETS ${PROJECT_NAME}
     18        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
     19)
  • trunk/demos/MixedReality/real/simulator/CMakeLists.txt

    r297 r299  
    3333TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    3434
     35INSTALL(
     36        TARGETS ${PROJECT_NAME}_rt
     37        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
     38)
     39
     40INSTALL(
     41        TARGETS ${PROJECT_NAME}_nrt
     42        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
     43)
     44
    3545else()
    3646    if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
     
    4050    endif()
    4151endif()
     52
  • trunk/demos/MixedReality/real/uav/CMakeLists.txt

    r297 r299  
    3434
    3535TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     36
     37INSTALL(
     38        TARGETS ${PROJECT_NAME}_rt
     39        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
     40)
     41
     42INSTALL(
     43        TARGETS ${PROJECT_NAME}_nrt
     44        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
     45)
  • trunk/demos/MixedReality/virtual/simulator/CMakeLists.txt

    r297 r299  
    3434TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    3535
     36INSTALL(
     37        TARGETS ${PROJECT_NAME}_rt
     38        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/virtual
     39)
     40
     41INSTALL(
     42        TARGETS ${PROJECT_NAME}_nrt
     43        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/virtual
     44)
     45
    3646else()
    3747    if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
  • trunk/demos/OpticalFlow/simulator/CMakeLists.txt

    r297 r299  
    3535
    3636TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     37
     38INSTALL(
     39        TARGETS ${PROJECT_NAME}_rt
     40        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/OpticalFlow
     41)
     42
     43INSTALL(
     44        TARGETS ${PROJECT_NAME}_nrt
     45        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/OpticalFlow
     46)
  • trunk/demos/OpticalFlow/uav/CMakeLists.txt

    r297 r299  
    3636TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    3737
     38INSTALL(
     39        TARGETS ${PROJECT_NAME}_rt
     40        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/OpticalFlow
     41)
     42
     43INSTALL(
     44        TARGETS ${PROJECT_NAME}_nrt
     45        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/OpticalFlow
     46)
     47
    3848else()
    3949    if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
  • trunk/demos/PidStandalone/simulator/CMakeLists.txt

    r297 r299  
    1 PROJECT(simulator_pid)
     1PROJECT(PidStandalone_simulator)
    22cmake_minimum_required(VERSION 2.8)
    33
     
    3030
    3131TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     32
     33INSTALL(
     34        TARGETS ${PROJECT_NAME}_rt
     35        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/PidStandalone
     36)
     37
     38INSTALL(
     39        TARGETS ${PROJECT_NAME}_nrt
     40        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/PidStandalone
     41)
     42
  • trunk/demos/PidStandalone/uav/CMakeLists.txt

    r297 r299  
    1 PROJECT(demo_pid)
     1PROJECT(PidStandalone)
    22cmake_minimum_required(VERSION 2.8)
    33
     
    3333
    3434TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     35
     36INSTALL(
     37        TARGETS ${PROJECT_NAME}_rt
     38        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/PidStandalone
     39)
     40
     41INSTALL(
     42        TARGETS ${PROJECT_NAME}_nrt
     43        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/PidStandalone
     44)
  • trunk/demos/SimpleFleet/simulator/CMakeLists.txt

    r297 r299  
    3030
    3131TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     32
     33INSTALL(
     34        TARGETS ${PROJECT_NAME}_rt
     35        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/SimpleFleet
     36)
     37
     38INSTALL(
     39        TARGETS ${PROJECT_NAME}_nrt
     40        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/SimpleFleet
     41)
  • trunk/demos/SimpleFleet/uav/CMakeLists.txt

    r297 r299  
    3434
    3535TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     36
     37INSTALL(
     38        TARGETS ${PROJECT_NAME}_rt
     39        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/SimpleFleet
     40)
     41
     42INSTALL(
     43        TARGETS ${PROJECT_NAME}_nrt
     44        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/SimpleFleet
     45)
  • trunk/demos/Sinus/CMakeLists.txt

    r297 r299  
    3636
    3737TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     38
     39INSTALL(
     40        TARGETS ${PROJECT_NAME}_rt
     41        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
     42)
     43
     44INSTALL(
     45        TARGETS ${PROJECT_NAME}_nrt
     46        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
     47)
Note: See TracChangeset for help on using the changeset viewer.