Changeset 302 in flair-src for trunk/demos/MixedReality/virtual/uav

Timestamp:

02/25/19 16:28:34 (5 years ago)

Author:

Sanahuja Guillaume

Message:

modifs nouveau build system

Location:

trunk/demos/MixedReality/virtual/uav

Files:

• CMakeLists.txt (modified) (3 diffs)
• resources/core2-64/x4.sh (modified) (1 diff)

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

@@ -2 +2 @@
 cmake_minimum_required(VERSION 2.8)
 
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 SET(FLAIR_USE_FILTER TRUE)
 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
@@ -8 +7 @@
 SET(FLAIR_USE_META TRUE)
 SET(FLAIR_USE_VRPN TRUE)
-SET(COPY_RESOURCE_FILES true)
 
-include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
-include(${FLAIR_USE_FILE})
+include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake)
 
 if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")
@@ -20 +17 @@
 )
 
-INCLUDE_DIRECTORIES(
-        ${FLAIR_INCLUDE_DIR}
-)
-
-#real time executable
-ADD_EXECUTABLE(${PROJECT_NAME}_rt
-        ${SRC_FILES}
-)
-
-TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})
-
-#non real time executable
-ADD_EXECUTABLE(${PROJECT_NAME}_nrt
-        ${SRC_FILES}
-)
-
-TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
-
-INSTALL(
-        TARGETS ${PROJECT_NAME}_rt
-        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
-)
-
-INSTALL(
-        TARGETS ${PROJECT_NAME}_nrt
-        RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
+FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}"
+           DEST_DIR MixedReality_virtual
+           COPY_RESOURCES
 )
 

trunk/demos/MixedReality/virtual/uav/resources/core2-64/x4.sh

@@ -7 +7 @@
 fi
 
-. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+. $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh
 
 $EXEC -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu0 -v 127.0.0.1:3884