Changeset 302 in flair-src for trunk/demos/MixedReality/real


Ignore:
Timestamp:
02/25/19 16:28:34 (3 years ago)
Author:
Sanahuja Guillaume
Message:

modifs nouveau build system

Location:
trunk/demos/MixedReality/real
Files:
4 edited

Legend:

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

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_SIMULATOR TRUE)
    65SET(FLAIR_USE_SIMULATOR_GL TRUE)
    7 SET(COPY_RESOURCE_FILES true)
    86
    9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    10 include(${FLAIR_USE_FILE})
     7include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    118
    129if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")
     
    1613)
    1714
    18 INCLUDE_DIRECTORIES(
    19         ${FLAIR_INCLUDE_DIR}
    20 )
    21 
    22 #real time executable
    23 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    24         ${SRC_FILES}
    25 )
    26 
    27 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    28 
    29 #non real time executable
    30 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    31         ${SRC_FILES}
    32 )
    33 
    34 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    35 
    36 INSTALL(
    37         TARGETS ${PROJECT_NAME}_rt
    38         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    39 )
    40 
    41 INSTALL(
    42         TARGETS ${PROJECT_NAME}_nrt
    43         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
     15FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     16           DEST_DIR MixedReality_real
     17           COPY_RESOURCES
    4418)
    4519
  • trunk/demos/MixedReality/real/simulator/resources/core2-64/simulator_x4.sh

    r301 r302  
    66fi
    77
    8 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     8. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    99
    10 $EXEC -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
     10$EXEC -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml
  • trunk/demos/MixedReality/real/uav/CMakeLists.txt

    r301 r302  
    22cmake_minimum_required(VERSION 2.8)
    33
    4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
    54SET(FLAIR_USE_FILTER TRUE)
    65SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
     
    87SET(FLAIR_USE_META TRUE)
    98SET(FLAIR_USE_VRPN TRUE)
    10 SET(COPY_RESOURCE_FILES true)
    11 
    12 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
    13 include(${FLAIR_USE_FILE})
     9include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
    1410
    1511SET(SRC_FILES
     
    1814)
    1915
    20 INCLUDE_DIRECTORIES(
    21         ${FLAIR_INCLUDE_DIR}
     16FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
     17           DEST_DIR MixedReality_real
     18           COPY_RESOURCES
    2219)
    23 
    24 #real time executable
    25 ADD_EXECUTABLE(${PROJECT_NAME}_rt
    26         ${SRC_FILES}
    27 )
    28 
    29 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
    30 
    31 #non real time executable
    32 ADD_EXECUTABLE(${PROJECT_NAME}_nrt
    33         ${SRC_FILES}
    34 )
    35 
    36 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
    37 
    38 INSTALL(
    39         TARGETS ${PROJECT_NAME}_rt
    40         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    41 )
    42 
    43 INSTALL(
    44         TARGETS ${PROJECT_NAME}_nrt
    45         RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
    46 )
  • trunk/demos/MixedReality/real/uav/resources/core2-64/x4.sh

    r301 r302  
    77fi
    88
    9 . $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
     9. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
    1010
    1111$EXEC -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu0 -v 127.0.0.1:3884
Note: See TracChangeset for help on using the changeset viewer.