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


Ignore:
Timestamp:
02/07/19 16:26:43 (3 years ago)
Author:
Sanahuja Guillaume
Message:

add demos resources

Location:
trunk/demos/MixedReality
Files:
23 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/MixedReality/real/simulator/CMakeLists.txt

    r299 r301  
    55SET(FLAIR_USE_SIMULATOR TRUE)
    66SET(FLAIR_USE_SIMULATOR_GL TRUE)
     7SET(COPY_RESOURCE_FILES true)
    78
    89include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     
    3536INSTALL(
    3637        TARGETS ${PROJECT_NAME}_rt
    37         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
     38        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    3839)
    3940
    4041INSTALL(
    4142        TARGETS ${PROJECT_NAME}_nrt
    42         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
     43        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    4344)
    4445
  • trunk/demos/MixedReality/real/uav/CMakeLists.txt

    r299 r301  
    88SET(FLAIR_USE_META TRUE)
    99SET(FLAIR_USE_VRPN TRUE)
     10SET(COPY_RESOURCE_FILES true)
    1011
    1112include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     
    3738INSTALL(
    3839        TARGETS ${PROJECT_NAME}_rt
    39         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
     40        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    4041)
    4142
    4243INSTALL(
    4344        TARGETS ${PROJECT_NAME}_nrt
    44         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
     45        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    4546)
  • trunk/demos/MixedReality/virtual/simulator/CMakeLists.txt

    r299 r301  
    66SET(FLAIR_USE_SIMULATOR_GL TRUE)
    77SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     8SET(COPY_RESOURCE_FILES true)
    89
    910include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
     
    3637INSTALL(
    3738        TARGETS ${PROJECT_NAME}_rt
    38         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/virtual
     39        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    3940)
    4041
    4142INSTALL(
    4243        TARGETS ${PROJECT_NAME}_nrt
    43         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/virtual
     44        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    4445)
    4546
  • trunk/demos/MixedReality/virtual/uav/CMakeLists.txt

    r297 r301  
    88SET(FLAIR_USE_META TRUE)
    99SET(FLAIR_USE_VRPN TRUE)
     10SET(COPY_RESOURCE_FILES true)
    1011
    1112include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    1213include(${FLAIR_USE_FILE})
     14
     15if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")
    1316
    1417SET(SRC_FILES
     
    3437
    3538TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
     39
     40INSTALL(
     41        TARGETS ${PROJECT_NAME}_rt
     42        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
     43)
     44
     45INSTALL(
     46        TARGETS ${PROJECT_NAME}_nrt
     47        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
     48)
     49
     50else()
     51    if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
     52        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE} architecture")
     53    else()
     54        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
     55    endif()
     56endif()
Note: See TracChangeset for help on using the changeset viewer.