Changeset 299 in flair-src for trunk

Timestamp:

Jan 30, 2019, 4:53:24 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

cleanup for out of source build

Location:

trunk/demos

Files:

• CMakeLists.txt (modified) (1 diff)
• CircleFollower/CMakeLists.txt (added)
• CircleFollower/simulator/CMakeLists.txt (modified) (1 diff)
• CircleFollower/simulator/build (deleted)
• CircleFollower/simulator/build_core2_64 (deleted)
• CircleFollower/uav/CMakeLists.txt (modified) (1 diff)
• CircleFollower/uav/build (deleted)
• CircleFollower/uav/build_armv5te (deleted)
• CircleFollower/uav/build_armv7a_neon (deleted)
• CircleFollower/uav/build_core2_64 (deleted)
• Gps/CMakeLists.txt (added)
• Gps/simulator/CMakeLists.txt (modified) (1 diff)
• Gps/simulator/build (deleted)
• Gps/simulator/build_core2_64 (deleted)
• Gps/uav/CMakeLists.txt (modified) (1 diff)
• Gps/uav/build (deleted)
• Gps/uav/build_armv5te (deleted)
• Gps/uav/build_armv7a_neon (deleted)
• Gps/uav/build_core2_64 (deleted)
• HelloWorld/CMakeLists.txt (modified) (1 diff)
• MixedReality/CMakeLists.txt (added)
• MixedReality/real/CMakeLists.txt (added)
• MixedReality/real/simulator/CMakeLists.txt (modified) (2 diffs)
• MixedReality/real/simulator/build_armv5te (deleted)
• MixedReality/real/simulator/build_armv7a_neon (deleted)
• MixedReality/real/simulator/build_core2_64 (deleted)
• MixedReality/real/simulator/build_cortexa7thf_neon_vfpv4 (deleted)
• MixedReality/real/uav/CMakeLists.txt (modified) (1 diff)
• MixedReality/real/uav/build_armv5te (deleted)
• MixedReality/real/uav/build_armv7a_neon (deleted)
• MixedReality/real/uav/build_core2_64 (deleted)
• MixedReality/real/uav/build_cortexa7thf_neon_vfpv4 (deleted)
• MixedReality/virtual/CMakeLists.txt (added)
• MixedReality/virtual/simulator/CMakeLists.txt (modified) (1 diff)
• MixedReality/virtual/simulator/build_armv5te (deleted)
• MixedReality/virtual/simulator/build_armv7a_neon (deleted)
• MixedReality/virtual/simulator/build_core2_64 (deleted)
• MixedReality/virtual/simulator/build_cortexa7thf_neon_vfpv4 (deleted)
• MixedReality/virtual/uav/build_armv5te (deleted)
• MixedReality/virtual/uav/build_armv7a_neon (deleted)
• MixedReality/virtual/uav/build_core2_64 (deleted)
• MixedReality/virtual/uav/build_cortexa7thf_neon_vfpv4 (deleted)
• OpticalFlow/CMakeLists.txt (added)
• OpticalFlow/simulator/CMakeLists.txt (modified) (1 diff)
• OpticalFlow/simulator/build_armv5te (deleted)
• OpticalFlow/simulator/build_armv7a_neon (deleted)
• OpticalFlow/simulator/build_core2_64 (deleted)
• OpticalFlow/uav/CMakeLists.txt (modified) (1 diff)
• OpticalFlow/uav/build_armv5te (deleted)
• OpticalFlow/uav/build_armv7a_neon (deleted)
• OpticalFlow/uav/build_core2_64 (deleted)
• PidStandalone/CMakeLists.txt (added)
• PidStandalone/simulator/CMakeLists.txt (modified) (2 diffs)
• PidStandalone/simulator/build_armv5te (deleted)
• PidStandalone/simulator/build_armv7a_neon (deleted)
• PidStandalone/simulator/build_core2_64 (deleted)
• PidStandalone/uav/CMakeLists.txt (modified) (2 diffs)
• PidStandalone/uav/build_armv5te (deleted)
• PidStandalone/uav/build_armv7a_neon (deleted)
• PidStandalone/uav/build_core2_64 (deleted)
• SimpleFleet/CMakeLists.txt (added)
• SimpleFleet/simulator/CMakeLists.txt (modified) (1 diff)
• SimpleFleet/simulator/build (deleted)
• SimpleFleet/simulator/build_armv5te (deleted)
• SimpleFleet/simulator/build_armv7a_neon (deleted)
• SimpleFleet/simulator/build_core2_64 (deleted)
• SimpleFleet/uav/CMakeLists.txt (modified) (1 diff)
• SimpleFleet/uav/build (deleted)
• SimpleFleet/uav/build_armv5te (deleted)
• SimpleFleet/uav/build_armv7a_neon (deleted)
• SimpleFleet/uav/build_core2_64 (deleted)
• Sinus/CMakeLists.txt (modified) (1 diff)
• Sinus/build (deleted)
• Sinus/build_armv5te (deleted)
• Sinus/build_armv7a_neon (deleted)
• Sinus/build_core2_64 (deleted)
• Skeletons/CMakeLists.txt (added)

trunk/demos/CMakeLists.txt

@@ -8 +8 @@
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/MixedReality/)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/OpticalFlow/)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/PidStandalone/)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/SimpleFleet/)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Sinus/)

trunk/demos/CircleFollower/simulator/CMakeLists.txt

@@ -30 +30 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/CircleFollower
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/CircleFollower
+)

trunk/demos/CircleFollower/uav/CMakeLists.txt

@@ -34 +34 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/CircleFollower
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/CircleFollower
+)

trunk/demos/Gps/simulator/CMakeLists.txt

@@ -30 +30 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT} nmea)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/Gps
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/Gps
+)

trunk/demos/Gps/uav/CMakeLists.txt

@@ -34 +34 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/Gps
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/Gps
+)

trunk/demos/HelloWorld/CMakeLists.txt

@@ -13 +13 @@
     COMMAND scp bin/${PROJECT_NAME} root@192.168.6.1:/home/root/
 )
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
+)

trunk/demos/MixedReality/real/simulator/CMakeLists.txt

@@ -33 +33 @@
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
 
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
+)
+
 else()
     if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
@@ -40 +50 @@
     endif()
 endif()
+

trunk/demos/MixedReality/real/uav/CMakeLists.txt

@@ -34 +34 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
+)

trunk/demos/MixedReality/virtual/simulator/CMakeLists.txt

@@ -34 +34 @@
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
 
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/virtual
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/virtual
+)
+
 else()
     if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)

trunk/demos/OpticalFlow/simulator/CMakeLists.txt

@@ -35 +35 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/OpticalFlow
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/OpticalFlow
+)

trunk/demos/OpticalFlow/uav/CMakeLists.txt

@@ -36 +36 @@
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
 
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/OpticalFlow
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/OpticalFlow
+)
+
 else()
     if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)

trunk/demos/PidStandalone/simulator/CMakeLists.txt

@@ -1 @@
-PROJECT(simulator_pid)
+PROJECT(PidStandalone_simulator)
 cmake_minimum_required(VERSION 2.8)
 
@@ -30 +30 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/PidStandalone
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/PidStandalone
+)
+

trunk/demos/PidStandalone/uav/CMakeLists.txt

@@ -1 @@
-PROJECT(demo_pid)
+PROJECT(PidStandalone)
 cmake_minimum_required(VERSION 2.8)
 
@@ -33 +33 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/PidStandalone
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/PidStandalone
+)

trunk/demos/SimpleFleet/simulator/CMakeLists.txt

@@ -30 +30 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/SimpleFleet
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/SimpleFleet
+)

trunk/demos/SimpleFleet/uav/CMakeLists.txt

@@ -34 +34 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/SimpleFleet
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/SimpleFleet
+)

trunk/demos/Sinus/CMakeLists.txt

@@ -36 +36 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_rt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
+)
+
+INSTALL(
+        TARGETS ${PROJECT_NAME}_nrt
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
+)