Changeset 293 in flair-src for trunk/demos

Timestamp:

01/09/19 15:23:29 (5 years ago)

Author:

Sanahuja Guillaume

Message:

folder reorganization

Location:

trunk/demos/MixedReality

Files:

• real (added)
• real/simulator (moved) (moved from trunk/demos/MixedReality/simulator_real )
• real/simulator/CMakeLists.txt (modified) (2 diffs)
• real/uav (moved) (moved from trunk/demos/MixedReality/uav_real )
• virtual (added)
• virtual/simulator (moved) (moved from trunk/demos/MixedReality/simulator_simu )
• virtual/simulator/CMakeLists.txt (modified) (3 diffs)
• virtual/simulator/build_core2_64/bin/simulator_x4.sh (modified) (1 diff)
• virtual/uav (moved) (moved from trunk/demos/MixedReality/uav_simu )
• virtual/uav/CMakeLists.txt (modified) (1 diff)
• virtual/uav/build_core2_64/bin/x4.sh (modified) (1 diff)
• virtual/uav/src/App.cpp (modified) (1 diff)
• virtual/uav/src/App.h (modified) (1 diff)

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

@@ -8 +8 @@
 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
@@ -30 +32 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+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()

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

@@ -1 @@
-PROJECT(MixedReality_simulator_simu)
+PROJECT(MixedReality_simulator_virtual)
 cmake_minimum_required(VERSION 2.8)
 
@@ -9 +9 @@
 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
@@ -31 +33 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+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()

trunk/demos/MixedReality/virtual/simulator/build_core2_64/bin/simulator_x4.sh

@@ -1 +1 @@
 #! /bin/bash
 if [ -f /proc/xenomai/version ];then
-        EXEC=./MixedReality_simulator_simu_rt
+        EXEC=./MixedReality_simulator_virtual_rt
 else
-        EXEC=./MixedReality_simulator_simu_nrt
+        EXEC=./MixedReality_simulator_virtual_nrt
 fi
 

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

@@ -1 @@
-PROJECT(MixedReality_uav_simu)
+PROJECT(MixedReality_uav_virtual)
 cmake_minimum_required(VERSION 2.8)
 

trunk/demos/MixedReality/virtual/uav/build_core2_64/bin/x4.sh

@@ -2 +2 @@
 
 if [ -f /proc/xenomai/version ];then
-        EXEC=./MixedReality_uav_simu_rt
+        EXEC=./MixedReality_uav_virtual_rt
 else
-        EXEC=./MixedReality_uav_simu_nrt
+        EXEC=./MixedReality_uav_virtual_nrt
 fi
 

trunk/demos/MixedReality/virtual/uav/src/App.cpp

@@ -7 +7 @@
 //  version:    $Id: $
 //
-//  purpose:    mixed reality demo, simulated uav side
+//  purpose:    mixed reality demo, virtual uav side
 //
 //

trunk/demos/MixedReality/virtual/uav/src/App.h

@@ -7 +7 @@
 //  version:    $Id: $
 //
-//  purpose:    mixed reality demo, simulated uav side
+//  purpose:    mixed reality demo, virtual uav side
 //
 //