Changeset 293 in flair-src for trunk


Ignore:
Timestamp:
Jan 9, 2019, 3:23:29 PM (6 years ago)
Author:
Sanahuja Guillaume
Message:

folder reorganization

Location:
trunk/demos/MixedReality
Files:
2 added
7 edited
4 moved

Legend:

Unmodified
Added
Removed

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

    r292 r293  
    88include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    99include(${FLAIR_USE_FILE})
     10
     11if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")
    1012
    1113SET(SRC_FILES
    … …  
    3032
    3133TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     34
     35else()
     36    if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
     37        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE} architecture")
     38    else()
     39        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
     40    endif()
     41endif()

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

    r292 r293  
    1 PROJECT(MixedReality_simulator_simu)
     1PROJECT(MixedReality_simulator_virtual)
    22cmake_minimum_required(VERSION 2.8)
    33
    … …  
    99include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    1010include(${FLAIR_USE_FILE})
     11
     12if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")
    1113
    1214SET(SRC_FILES
    … …  
    3133
    3234TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     35
     36else()
     37    if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
     38        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE} architecture")
     39    else()
     40        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
     41    endif()
     42endif()

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

    r292 r293  
    11#! /bin/bash
    22if [ -f /proc/xenomai/version ];then
    3         EXEC=./MixedReality_simulator_simu_rt
     3        EXEC=./MixedReality_simulator_virtual_rt
    44else
    5         EXEC=./MixedReality_simulator_simu_nrt
     5        EXEC=./MixedReality_simulator_virtual_nrt
    66fi
    77

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

    r292 r293  
    1 PROJECT(MixedReality_uav_simu)
     1PROJECT(MixedReality_uav_virtual)
    22cmake_minimum_required(VERSION 2.8)
    33

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

    r292 r293  
    22
    33if [ -f /proc/xenomai/version ];then
    4         EXEC=./MixedReality_uav_simu_rt
     4        EXEC=./MixedReality_uav_virtual_rt
    55else
    6         EXEC=./MixedReality_uav_simu_nrt
     6        EXEC=./MixedReality_uav_virtual_nrt
    77fi
    88

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

    r292 r293  
    77//  version:    $Id: $
    88//
    9 //  purpose:    mixed reality demo, simulated uav side
     9//  purpose:    mixed reality demo, virtual uav side
    1010//
    1111//

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

    r292 r293  
    77//  version:    $Id: $
    88//
    9 //  purpose:    mixed reality demo, simulated uav side
     9//  purpose:    mixed reality demo, virtual uav side
    1010//
    1111//
Note: See TracChangeset for help on using the changeset viewer.