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

Timestamp:

02/07/19 16:26:43 (5 years ago)

Author:

Sanahuja Guillaume

Message:

add demos resources

Location:

trunk/demos/MixedReality

Files:

• real/simulator/CMakeLists.txt (modified) (2 diffs)
• real/simulator/resources (added)
• real/simulator/resources/core2-64 (added)
• real/simulator/resources/core2-64/simulator_x4.sh (added)
• real/simulator/resources/core2-64/simulator_x4.xml (added)
• real/uav/CMakeLists.txt (modified) (2 diffs)
• real/uav/resources (added)
• real/uav/resources/armv7a-neon (added)
• real/uav/resources/armv7a-neon/MixedReality_ardrone2.sh (added)
• real/uav/resources/armv7a-neon/MixedReality_ardrone2.xml (added)
• real/uav/resources/armv7a-neon/MixedReality_bebop.sh (added)
• real/uav/resources/armv7a-neon/MixedReality_bebop.xml (added)
• real/uav/resources/armv7a-neon/MixedReality_hdsx8.sh (added)
• real/uav/resources/armv7a-neon/MixedReality_hdsx8.xml (added)
• real/uav/resources/core2-64 (added)
• real/uav/resources/core2-64/setup_x4.xml (added)
• real/uav/resources/core2-64/x4.sh (added)
• virtual/simulator/CMakeLists.txt (modified) (2 diffs)
• virtual/simulator/resources (added)
• virtual/simulator/resources/core2-64 (added)
• virtual/simulator/resources/core2-64/simulator_x4.sh (added)
• virtual/simulator/resources/core2-64/simulator_x4.xml (added)
• virtual/uav/CMakeLists.txt (modified) (2 diffs)
• virtual/uav/resources (added)
• virtual/uav/resources/core2-64 (added)
• virtual/uav/resources/core2-64/setup_x4.xml (added)
• virtual/uav/resources/core2-64/x4.sh (added)

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

@@ -5 +5 @@
 SET(FLAIR_USE_SIMULATOR TRUE)
 SET(FLAIR_USE_SIMULATOR_GL TRUE)
+SET(COPY_RESOURCE_FILES true)
 
 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
@@ -35 +36 @@
 INSTALL(
         TARGETS ${PROJECT_NAME}_rt
-        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
+        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}/MixedReality/real
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
 )
 

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

@@ -8 +8 @@
 SET(FLAIR_USE_META TRUE)
 SET(FLAIR_USE_VRPN TRUE)
+SET(COPY_RESOURCE_FILES true)
 
 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
@@ -37 +38 @@
 INSTALL(
         TARGETS ${PROJECT_NAME}_rt
-        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
+        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}/MixedReality/real
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
 )

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

@@ -6 +6 @@
 SET(FLAIR_USE_SIMULATOR_GL TRUE)
 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
+SET(COPY_RESOURCE_FILES true)
 
 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
@@ -36 +37 @@
 INSTALL(
         TARGETS ${PROJECT_NAME}_rt
-        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/virtual
+        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}/MixedReality/virtual
+        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
 )
 

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

@@ -8 +8 @@
 SET(FLAIR_USE_META TRUE)
 SET(FLAIR_USE_VRPN TRUE)
+SET(COPY_RESOURCE_FILES true)
 
 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
 include(${FLAIR_USE_FILE})
+
+if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")
 
 SET(SRC_FILES
@@ -34 +37 @@
 
 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}
+)
+
+else()
+    if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
+        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE} architecture")
+    else()
+        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
+    endif()
+endif()