Changeset 299 in flair-src for trunk/demos/MixedReality

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

cleanup for out of source build

Location:

trunk/demos/MixedReality

Files:

• CMakeLists.txt (added)
• real/CMakeLists.txt (added)
• real/simulator/CMakeLists.txt (modified) (2 diffs)
• real/simulator/build_armv5te (deleted)
• real/simulator/build_armv7a_neon (deleted)
• real/simulator/build_core2_64 (deleted)
• real/simulator/build_cortexa7thf_neon_vfpv4 (deleted)
• real/uav/CMakeLists.txt (modified) (1 diff)
• real/uav/build_armv5te (deleted)
• real/uav/build_armv7a_neon (deleted)
• real/uav/build_core2_64 (deleted)
• real/uav/build_cortexa7thf_neon_vfpv4 (deleted)
• virtual/CMakeLists.txt (added)
• virtual/simulator/CMakeLists.txt (modified) (1 diff)
• virtual/simulator/build_armv5te (deleted)
• virtual/simulator/build_armv7a_neon (deleted)
• virtual/simulator/build_core2_64 (deleted)
• virtual/simulator/build_cortexa7thf_neon_vfpv4 (deleted)
• virtual/uav/build_armv5te (deleted)
• virtual/uav/build_armv7a_neon (deleted)
• virtual/uav/build_core2_64 (deleted)
• virtual/uav/build_cortexa7thf_neon_vfpv4 (deleted)

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)