Changeset 293 in flair-src for trunk/demos/MixedReality/virtual/simulator

Timestamp:

Jan 9, 2019, 3:23:29 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

folder reorganization

Location:

trunk/demos/MixedReality/virtual

Files:

• . (added)
• simulator (moved) (moved from trunk/demos/MixedReality/simulator_simu )
• simulator/CMakeLists.txt (modified) (3 diffs)
• simulator/build_core2_64/bin/simulator_x4.sh (modified) (1 diff)

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