Changeset 302 in flair-src
- Timestamp:
- 02/25/19 16:28:34 (5 years ago)
- Location:
- trunk
- Files:
-
- 49 added
- 1 deleted
- 66 edited
-
CMakeLists.txt (modified) (1 diff)
-
ReleaseNotes (modified) (1 diff)
-
cmake-modules (added)
-
cmake-modules/ArchDir.cmake (added)
-
cmake-modules/ColoredMessage.cmake (added)
-
cmake-modules/FindXenomai.cmake (added)
-
cmake-modules/FlairUseFile.cmake (added)
-
cmake-modules/GlobalCmakeFlair.cmake (added)
-
demos/CMakeLists.txt (modified) (1 diff)
-
demos/CircleFollower/simulator/CMakeLists.txt (modified) (2 diffs)
-
demos/CircleFollower/simulator/resources/core2-64/simulator_x4.sh (modified) (1 diff)
-
demos/CircleFollower/simulator/resources/core2-64/simulator_x8.sh (modified) (2 diffs)
-
demos/CircleFollower/uav/CMakeLists.txt (modified) (3 diffs)
-
demos/CircleFollower/uav/resources/core2-64/x4.sh (modified) (1 diff)
-
demos/CircleFollower/uav/resources/core2-64/x8.sh (modified) (1 diff)
-
demos/Gps/simulator/CMakeLists.txt (modified) (2 diffs)
-
demos/Gps/simulator/resources/core2-64/simulator_x4.sh (modified) (1 diff)
-
demos/Gps/simulator/resources/core2-64/simulator_x8.sh (modified) (1 diff)
-
demos/Gps/uav/CMakeLists.txt (modified) (2 diffs)
-
demos/Gps/uav/resources/core2-64/x4.sh (modified) (1 diff)
-
demos/Gps/uav/resources/core2-64/x8.sh (modified) (1 diff)
-
demos/HelloWorld/CMakeLists.txt (modified) (1 diff)
-
demos/MixedReality/real/simulator/CMakeLists.txt (modified) (2 diffs)
-
demos/MixedReality/real/simulator/resources/core2-64/simulator_x4.sh (modified) (1 diff)
-
demos/MixedReality/real/uav/CMakeLists.txt (modified) (3 diffs)
-
demos/MixedReality/real/uav/resources/core2-64/x4.sh (modified) (1 diff)
-
demos/MixedReality/virtual/simulator/CMakeLists.txt (modified) (2 diffs)
-
demos/MixedReality/virtual/simulator/resources/core2-64/simulator_x4.sh (modified) (1 diff)
-
demos/MixedReality/virtual/uav/CMakeLists.txt (modified) (3 diffs)
-
demos/MixedReality/virtual/uav/resources/core2-64/x4.sh (modified) (1 diff)
-
demos/OpticalFlow/simulator/CMakeLists.txt (modified) (2 diffs)
-
demos/OpticalFlow/simulator/resources/core2-64/simulator_x4.sh (modified) (1 diff)
-
demos/OpticalFlow/simulator/resources/core2-64/simulator_x8.sh (modified) (1 diff)
-
demos/OpticalFlow/uav/CMakeLists.txt (modified) (2 diffs)
-
demos/OpticalFlow/uav/resources/core2-64/x4.sh (modified) (1 diff)
-
demos/OpticalFlow/uav/resources/core2-64/x8.sh (modified) (1 diff)
-
demos/PidStandalone/simulator/CMakeLists.txt (modified) (2 diffs)
-
demos/PidStandalone/simulator/resources/core2-64/simulator_x4.sh (modified) (1 diff)
-
demos/PidStandalone/simulator/resources/core2-64/simulator_x8.sh (modified) (1 diff)
-
demos/PidStandalone/uav/CMakeLists.txt (modified) (2 diffs)
-
demos/PidStandalone/uav/resources/core2-64/x4.sh (modified) (1 diff)
-
demos/PidStandalone/uav/resources/core2-64/x8.sh (modified) (1 diff)
-
demos/SimpleFleet/simulator/CMakeLists.txt (modified) (2 diffs)
-
demos/SimpleFleet/simulator/resources/core2-64/simulator_x8.sh (modified) (1 diff)
-
demos/SimpleFleet/uav/CMakeLists.txt (modified) (3 diffs)
-
demos/SimpleFleet/uav/resources/core2-64/x8_0.sh (modified) (1 diff)
-
demos/SimpleFleet/uav/resources/core2-64/x8_1.sh (modified) (1 diff)
-
demos/Sinus/CMakeLists.txt (modified) (2 diffs)
-
demos/Sinus/resources/core2-64/Sinus.sh (modified) (1 diff)
-
demos/Skeletons/CustomReferenceAngles/CMakeLists.txt (modified) (3 diffs)
-
demos/Skeletons/CustomTorques/CMakeLists.txt (modified) (3 diffs)
-
lib/CMakeLists.txt (modified) (1 diff)
-
lib/Doxyfile.in (modified) (1 diff)
-
lib/FlairCore/CMakeLists.txt (modified) (2 diffs)
-
lib/FlairCore/nrt/CMakeLists.txt (modified) (1 diff)
-
lib/FlairCore/rt/CMakeLists.txt (modified) (1 diff)
-
lib/FlairCore/src/Widget.h (modified) (1 diff)
-
lib/FlairFilter/CMakeLists.txt (modified) (2 diffs)
-
lib/FlairMeta/CMakeLists.txt (modified) (2 diffs)
-
lib/FlairSensorActuator/CMakeLists.txt (modified) (2 diffs)
-
lib/FlairSimulator/CMakeLists.txt (modified) (2 diffs)
-
lib/FlairSimulator/gl/CMakeLists.txt (modified) (1 diff)
-
lib/FlairSimulator/no_gl/CMakeLists.txt (modified) (1 diff)
-
lib/FlairSimulator/src/Parser.cpp (modified) (1 diff)
-
lib/FlairSimulator/src/Parser.h (modified) (1 diff)
-
lib/FlairVisionFilter/CMakeLists.txt (modified) (2 diffs)
-
lib/FlairVisionFilter/src/unexported (deleted)
-
models (added)
-
models/25h9_id0.png (added)
-
models/carbone.jpg (added)
-
models/city_tile.xml (added)
-
models/city_tile.zip (added)
-
models/font (added)
-
models/font/simu_axis_font.xml (added)
-
models/font/simu_axis_font0.png (added)
-
models/font/simu_axis_font1.png (added)
-
models/font/simu_axis_font10.png (added)
-
models/font/simu_axis_font11.png (added)
-
models/font/simu_axis_font12.png (added)
-
models/font/simu_axis_font13.png (added)
-
models/font/simu_axis_font14.png (added)
-
models/font/simu_axis_font15.png (added)
-
models/font/simu_axis_font2.png (added)
-
models/font/simu_axis_font3.png (added)
-
models/font/simu_axis_font4.png (added)
-
models/font/simu_axis_font5.png (added)
-
models/font/simu_axis_font6.png (added)
-
models/font/simu_axis_font7.png (added)
-
models/font/simu_axis_font8.png (added)
-
models/font/simu_axis_font9.png (added)
-
models/indoor_flight_arena.xml (added)
-
models/indoor_flight_arena.zip (added)
-
models/indoor_flight_arena_with_line.xml (added)
-
models/metal047.jpg (added)
-
models/newMAP.xml (added)
-
models/newMAP.zip (added)
-
models/ninja.b3d (added)
-
models/nskinbl.jpg (added)
-
models/scene.dtd (added)
-
models/suivideligne.mtl (added)
-
models/suivideligne.obj (added)
-
scripts (added)
-
scripts/LICENSE-header.txt (added)
-
scripts/cmake_codelite.sh (added)
-
scripts/cmake_codelite_outofsource.sh (added)
-
scripts/compile_info.sh (added)
-
scripts/distribution_specific_hack.sh (added)
-
scripts/flair_compile_all.sh (added)
-
scripts/flair_format_dir.sh (added)
-
scripts/update-license.sed (added)
-
tools/CMakeLists.txt (modified) (1 diff)
-
tools/Controller/DualShock3/CMakeLists.txt (modified) (1 diff)
-
tools/Controller/Mavlink/CMakeLists.txt (modified) (2 diffs)
-
tools/Dbt2csv/CMakeLists.txt (modified) (3 diffs)
-
tools/FlairGCS/CMakeLists.txt (modified) (3 diffs)
-
tools/VrpnBridge/CMakeLists.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r298 r302 1 1 PROJECT(Flair) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair- dev/cmake-modules/GlobalCmakeFlair.cmake)3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 4 4 include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) 5 5 -
trunk/ReleaseNotes
r282 r302 1 1 * Actual Version: 2 2 3 - new build system, now out of source; binaries are no longer provided in repositories 3 4 - corrected a bug with vrpn delta time calculation 4 5 -
trunk/demos/CMakeLists.txt
r299 r302 1 1 PROJECT(FlairDemos) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair- dev/cmake-modules/GlobalCmakeFlair.cmake)3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 4 4 5 5 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/CircleFollower/) -
trunk/demos/CircleFollower/simulator/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_SIMULATOR TRUE) 6 5 SET(FLAIR_USE_SIMULATOR_GL TRUE) 7 SET(COPY_RESOURCE_FILES true)8 6 9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 10 include(${FLAIR_USE_FILE}) 7 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 11 8 12 9 SET(SRC_FILES … … 14 11 ) 15 12 16 INCLUDE_DIRECTORIES( 17 ${FLAIR_INCLUDE_DIR} 13 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 14 DEST_DIR CircleFollower 15 COPY_RESOURCES 18 16 ) 19 20 #real time executable21 ADD_EXECUTABLE(${PROJECT_NAME}_rt22 ${SRC_FILES}23 )24 25 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})26 27 #non real time executable28 ADD_EXECUTABLE(${PROJECT_NAME}_nrt29 ${SRC_FILES}30 )31 32 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})33 34 INSTALL(35 TARGETS ${PROJECT_NAME}_rt36 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}37 )38 39 INSTALL(40 TARGETS ${PROJECT_NAME}_nrt41 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}42 ) -
trunk/demos/CircleFollower/simulator/resources/core2-64/simulator_x4.sh
r301 r302 6 6 fi 7 7 8 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh8 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 9 9 10 $EXEC -n x4_0 -t x4 -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.xml10 $EXEC -n x4_0 -t x4 -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/CircleFollower/simulator/resources/core2-64/simulator_x8.sh
r301 r302 1 1 #! /bin/bash 2 2 3 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh3 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 4 4 5 5 if [ -f /proc/xenomai/version ];then … … 9 9 fi 10 10 11 $EXEC -n x8_0 -t x8 -p 9000 -a 127.0.0.1 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair- bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml11 $EXEC -n x8_0 -t x8 -p 9000 -a 127.0.0.1 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml -
trunk/demos/CircleFollower/uav/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_FILTER TRUE) 6 5 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE) … … 8 7 SET(FLAIR_USE_META TRUE) 9 8 SET(FLAIR_USE_VRPN TRUE) 10 SET(COPY_RESOURCE_FILES true)11 9 12 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 13 include(${FLAIR_USE_FILE}) 10 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 14 11 15 12 SET(SRC_FILES … … 18 15 ) 19 16 20 INCLUDE_DIRECTORIES( 21 ${FLAIR_INCLUDE_DIR} 17 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 18 DEST_DIR CircleFollower 19 COPY_RESOURCES 22 20 ) 23 24 #real time executable25 ADD_EXECUTABLE(${PROJECT_NAME}_rt26 ${SRC_FILES}27 )28 29 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})30 31 #non real time executable32 ADD_EXECUTABLE(${PROJECT_NAME}_nrt33 ${SRC_FILES}34 )35 36 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})37 38 INSTALL(39 TARGETS ${PROJECT_NAME}_rt40 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}41 )42 43 INSTALL(44 TARGETS ${PROJECT_NAME}_nrt45 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}46 ) -
trunk/demos/CircleFollower/uav/resources/core2-64/x4.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 11 $EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu -
trunk/demos/CircleFollower/uav/resources/core2-64/x8.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 11 $EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu -
trunk/demos/Gps/simulator/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_SIMULATOR TRUE) 6 5 SET(FLAIR_USE_SIMULATOR_GL TRUE) 7 SET(COPY_RESOURCE_FILES true)8 6 9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 10 include(${FLAIR_USE_FILE}) 7 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 11 8 12 9 SET(SRC_FILES … … 14 11 ) 15 12 16 INCLUDE_DIRECTORIES( 17 ${FLAIR_INCLUDE_DIR} 13 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 14 DEST_DIR Gps 15 COPY_RESOURCES 18 16 ) 19 20 #real time executable21 ADD_EXECUTABLE(${PROJECT_NAME}_rt22 ${SRC_FILES}23 )24 25 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT} nmea)26 27 #non real time executable28 ADD_EXECUTABLE(${PROJECT_NAME}_nrt29 ${SRC_FILES}30 )31 32 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT} nmea)33 34 INSTALL(35 TARGETS ${PROJECT_NAME}_rt36 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}37 )38 39 INSTALL(40 TARGETS ${PROJECT_NAME}_nrt41 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}42 ) -
trunk/demos/Gps/simulator/resources/core2-64/simulator_x4.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 $EXEC -n x4_0 -t x4 -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.xml11 $EXEC -n x4_0 -t x4 -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/Gps/simulator/resources/core2-64/simulator_x8.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 $EXEC -n x8_0 -t x8 -p 9000 -a 127.0.0.1 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair- bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml11 $EXEC -n x8_0 -t x8 -p 9000 -a 127.0.0.1 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml -
trunk/demos/Gps/uav/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_FILTER TRUE) 6 5 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE) 7 6 SET(FLAIR_USE_VISION_FILTER TRUE) 8 7 SET(FLAIR_USE_META TRUE) 9 SET(COPY_RESOURCE_FILES true)10 8 11 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 12 include(${FLAIR_USE_FILE}) 9 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 13 10 14 11 SET(SRC_FILES … … 17 14 ) 18 15 19 20 INCLUDE_DIRECTORIES( 21 ${FLAIR_INCLUDE_DIR} 16 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 17 DEST_DIR Gps 18 COPY_RESOURCES 22 19 ) 23 24 #real time executable25 ADD_EXECUTABLE(${PROJECT_NAME}_rt26 ${SRC_FILES}27 )28 29 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})30 31 #non real time executable32 ADD_EXECUTABLE(${PROJECT_NAME}_nrt33 ${SRC_FILES}34 )35 36 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})37 38 INSTALL(39 TARGETS ${PROJECT_NAME}_rt40 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}41 )42 43 INSTALL(44 TARGETS ${PROJECT_NAME}_nrt45 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}46 ) -
trunk/demos/Gps/uav/resources/core2-64/x4.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 11 $EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu -
trunk/demos/Gps/uav/resources/core2-64/x8.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 11 $EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu -
trunk/demos/HelloWorld/CMakeLists.txt
r299 r302 8 8 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) 9 9 10 add_custom_target(11 delivery12 COMMAND make13 COMMAND scp bin/${PROJECT_NAME} root@192.168.6.1:/home/root/14 )10 #add_custom_target( 11 # delivery 12 # COMMAND make 13 # COMMAND scp bin/${PROJECT_NAME} root@192.168.147.63:/home/root/ 14 #) 15 15 16 16 INSTALL( 17 17 TARGETS ${PROJECT_NAME} 18 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair- bin/demos/${ARCH_DIR}/${PROJECT_NAME}18 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-install/bin/demos/${ARCH_DIR}/${PROJECT_NAME} 19 19 ) -
trunk/demos/MixedReality/real/simulator/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_SIMULATOR TRUE) 6 5 SET(FLAIR_USE_SIMULATOR_GL TRUE) 7 SET(COPY_RESOURCE_FILES true)8 6 9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 10 include(${FLAIR_USE_FILE}) 7 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 11 8 12 9 if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64") … … 16 13 ) 17 14 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} 15 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 16 DEST_DIR MixedReality_real 17 COPY_RESOURCES 44 18 ) 45 19 -
trunk/demos/MixedReality/real/simulator/resources/core2-64/simulator_x4.sh
r301 r302 6 6 fi 7 7 8 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh8 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 9 9 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.xml10 $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 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_FILTER TRUE) 6 5 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE) … … 8 7 SET(FLAIR_USE_META TRUE) 9 8 SET(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}) 9 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 14 10 15 11 SET(SRC_FILES … … 18 14 ) 19 15 20 INCLUDE_DIRECTORIES( 21 ${FLAIR_INCLUDE_DIR} 16 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 17 DEST_DIR MixedReality_real 18 COPY_RESOURCES 22 19 ) 23 24 #real time executable25 ADD_EXECUTABLE(${PROJECT_NAME}_rt26 ${SRC_FILES}27 )28 29 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})30 31 #non real time executable32 ADD_EXECUTABLE(${PROJECT_NAME}_nrt33 ${SRC_FILES}34 )35 36 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})37 38 INSTALL(39 TARGETS ${PROJECT_NAME}_rt40 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}41 )42 43 INSTALL(44 TARGETS ${PROJECT_NAME}_nrt45 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 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 11 $EXEC -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu0 -v 127.0.0.1:3884 -
trunk/demos/MixedReality/virtual/simulator/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_SIMULATOR TRUE) 6 5 SET(FLAIR_USE_SIMULATOR_GL TRUE) 7 6 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE) 8 SET(COPY_RESOURCE_FILES true)9 7 10 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 11 include(${FLAIR_USE_FILE}) 8 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 12 9 13 10 if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64") … … 17 14 ) 18 15 19 INCLUDE_DIRECTORIES( 20 ${FLAIR_INCLUDE_DIR} 21 ) 22 23 #real time executable 24 ADD_EXECUTABLE(${PROJECT_NAME}_rt 25 ${SRC_FILES} 26 ) 27 28 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT}) 29 30 #non real time executable 31 ADD_EXECUTABLE(${PROJECT_NAME}_nrt 32 ${SRC_FILES} 33 ) 34 35 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT}) 36 37 INSTALL( 38 TARGETS ${PROJECT_NAME}_rt 39 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME} 40 ) 41 42 INSTALL( 43 TARGETS ${PROJECT_NAME}_nrt 44 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME} 16 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 17 DEST_DIR MixedReality_virtual 18 COPY_RESOURCES 45 19 ) 46 20 -
trunk/demos/MixedReality/virtual/simulator/resources/core2-64/simulator_x4.sh
r301 r302 6 6 fi 7 7 8 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh8 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 9 9 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 -v 127.0.0.1:388310 $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 -v 127.0.0.1:3883 -
trunk/demos/MixedReality/virtual/uav/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_FILTER TRUE) 6 5 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE) … … 8 7 SET(FLAIR_USE_META TRUE) 9 8 SET(FLAIR_USE_VRPN TRUE) 10 SET(COPY_RESOURCE_FILES true)11 9 12 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 13 include(${FLAIR_USE_FILE}) 10 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 14 11 15 12 if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64") … … 20 17 ) 21 18 22 INCLUDE_DIRECTORIES( 23 ${FLAIR_INCLUDE_DIR} 24 ) 25 26 #real time executable 27 ADD_EXECUTABLE(${PROJECT_NAME}_rt 28 ${SRC_FILES} 29 ) 30 31 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT}) 32 33 #non real time executable 34 ADD_EXECUTABLE(${PROJECT_NAME}_nrt 35 ${SRC_FILES} 36 ) 37 38 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT}) 39 40 INSTALL( 41 TARGETS ${PROJECT_NAME}_rt 42 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME} 43 ) 44 45 INSTALL( 46 TARGETS ${PROJECT_NAME}_nrt 47 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME} 19 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 20 DEST_DIR MixedReality_virtual 21 COPY_RESOURCES 48 22 ) 49 23 -
trunk/demos/MixedReality/virtual/uav/resources/core2-64/x4.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 11 $EXEC -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu0 -v 127.0.0.1:3884 -
trunk/demos/OpticalFlow/simulator/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_SIMULATOR TRUE) 6 5 SET(FLAIR_USE_SIMULATOR_GL TRUE) 7 SET(COPY_RESOURCE_FILES true)8 6 9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 10 include(${FLAIR_USE_FILE}) 7 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 11 8 12 9 SET(SRC_FILES … … 14 11 ) 15 12 16 LINK_DIRECTORIES ( 17 ${FLAIR_LIBRARY_DIR} 13 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 14 DEST_DIR OpticalFlow 15 COPY_RESOURCES 18 16 ) 19 20 INCLUDE_DIRECTORIES(21 ${FLAIR_INCLUDE_DIR}22 )23 24 #real time executable25 ADD_EXECUTABLE(${PROJECT_NAME}_rt26 ${SRC_FILES}27 )28 29 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})30 31 #non real time executable32 ADD_EXECUTABLE(${PROJECT_NAME}_nrt33 ${SRC_FILES}34 )35 36 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})37 38 INSTALL(39 TARGETS ${PROJECT_NAME}_rt40 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}41 )42 43 INSTALL(44 TARGETS ${PROJECT_NAME}_nrt45 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}46 ) -
trunk/demos/OpticalFlow/simulator/resources/core2-64/simulator_x4.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 $EXEC -n x4_0 -t x4 -a 127.0.0.1 -p 9000 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair- bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml11 $EXEC -n x4_0 -t x4 -a 127.0.0.1 -p 9000 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml -
trunk/demos/OpticalFlow/simulator/resources/core2-64/simulator_x8.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 $EXEC -n x8_0 -t x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair- bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml11 $EXEC -n x8_0 -t x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml -
trunk/demos/OpticalFlow/uav/CMakeLists.txt
r301 r302 1 1 PROJECT(OpticalFlow) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair- dev/cmake-modules/GlobalCmakeFlair.cmake)3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 4 4 5 5 if(NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te") 6 6 7 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)8 7 SET(FLAIR_USE_FILTER TRUE) 9 8 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE) 10 9 SET(FLAIR_USE_VISION_FILTER TRUE) 11 10 SET(FLAIR_USE_META TRUE) 12 SET(COPY_RESOURCE_FILES true)13 14 include(${FLAIR_USE_FILE})15 11 16 12 SET(SRC_FILES … … 19 15 ) 20 16 21 INCLUDE_DIRECTORIES( 22 ${FLAIR_INCLUDE_DIR} 23 ) 24 25 #real time executable 26 ADD_EXECUTABLE(${PROJECT_NAME}_rt 27 ${SRC_FILES} 28 ) 29 30 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT}) 31 32 #non real time executable 33 ADD_EXECUTABLE(${PROJECT_NAME}_nrt 34 ${SRC_FILES} 35 ) 36 37 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT}) 38 39 INSTALL( 40 TARGETS ${PROJECT_NAME}_rt 41 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME} 42 ) 43 44 INSTALL( 45 TARGETS ${PROJECT_NAME}_nrt 46 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME} 17 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 18 DEST_DIR OpticalFlow 19 COPY_RESOURCES 47 20 ) 48 21 -
trunk/demos/OpticalFlow/uav/resources/core2-64/x4.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 11 $EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu -v dsp_stub -
trunk/demos/OpticalFlow/uav/resources/core2-64/x8.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 11 $EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x8.xml -t x8_simu -v dsp_stub -
trunk/demos/PidStandalone/simulator/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_SIMULATOR TRUE) 6 5 SET(FLAIR_USE_SIMULATOR_GL TRUE) 7 SET(COPY_RESOURCE_FILES true)8 6 9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 10 include(${FLAIR_USE_FILE}) 11 7 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 12 8 13 9 SET(SRC_FILES … … 15 11 ) 16 12 17 INCLUDE_DIRECTORIES( 18 ${FLAIR_INCLUDE_DIR} 13 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 14 DEST_DIR PidStandalone 15 COPY_RESOURCES 19 16 ) 20 21 #real time executable22 ADD_EXECUTABLE(${PROJECT_NAME}_rt23 ${SRC_FILES}24 )25 26 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})27 28 #non real time executable29 ADD_EXECUTABLE(${PROJECT_NAME}_nrt30 ${SRC_FILES}31 )32 33 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})34 35 INSTALL(36 TARGETS ${PROJECT_NAME}_rt37 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}38 )39 40 INSTALL(41 TARGETS ${PROJECT_NAME}_nrt42 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}43 )44 -
trunk/demos/PidStandalone/simulator/resources/core2-64/simulator_x4.sh
r301 r302 7 7 fi 8 8 9 . $ IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 $EXEC -n x4_0 -t x4 -a 127.0.0.1 -p 9000 -x simulator_x4.xml -o 10 -m $ IGEP_ROOT/uav_dev/media -s $IGEP_ROOT/uav_dev/media/optitrack_b122.xml11 $EXEC -n x4_0 -t x4 -a 127.0.0.1 -p 9000 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml -
trunk/demos/PidStandalone/simulator/resources/core2-64/simulator_x8.sh
r301 r302 7 7 fi 8 8 9 . $ IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 $EXEC -n x8_0 -t x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $ IGEP_ROOT/uav_dev/media -s $IGEP_ROOT/uav_dev/media/optitrack_b122.xml11 $EXEC -n x8_0 -t x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml -
trunk/demos/PidStandalone/uav/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_FILTER TRUE) 6 5 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE) 7 6 SET(FLAIR_USE_VISION_FILTER TRUE) 8 7 SET(FLAIR_USE_META TRUE) 9 SET(COPY_RESOURCE_FILES true)10 8 11 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 12 include(${FLAIR_USE_FILE}) 9 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 13 10 14 11 SET(SRC_FILES … … 17 14 ) 18 15 19 INCLUDE_DIRECTORIES( 20 ${FLAIR_INCLUDE_DIR} 16 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 17 DEST_DIR PidStandalone 18 COPY_RESOURCES 21 19 ) 22 23 #real time executable24 ADD_EXECUTABLE(${PROJECT_NAME}_rt25 ${SRC_FILES}26 )27 28 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})29 30 #non real time executable31 ADD_EXECUTABLE(${PROJECT_NAME}_nrt32 ${SRC_FILES}33 )34 35 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})36 37 INSTALL(38 TARGETS ${PROJECT_NAME}_rt39 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}40 )41 42 INSTALL(43 TARGETS ${PROJECT_NAME}_nrt44 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}45 ) -
trunk/demos/PidStandalone/uav/resources/core2-64/x4.sh
r301 r302 6 6 fi 7 7 8 . $ IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh8 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 9 9 10 10 $EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x4.xml -t x4_simu $* -
trunk/demos/PidStandalone/uav/resources/core2-64/x8.sh
r301 r302 7 7 fi 8 8 9 . $ IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 11 $EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu -
trunk/demos/SimpleFleet/simulator/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_SIMULATOR TRUE) 6 5 SET(FLAIR_USE_SIMULATOR_GL TRUE) 7 SET(COPY_RESOURCE_FILES true)8 6 9 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 10 include(${FLAIR_USE_FILE}) 7 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 11 8 12 9 SET(SRC_FILES … … 14 11 ) 15 12 16 INCLUDE_DIRECTORIES( 17 ${FLAIR_INCLUDE_DIR} 13 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 14 DEST_DIR SimpleFleet 15 COPY_RESOURCES 18 16 ) 19 20 #real time executable21 ADD_EXECUTABLE(${PROJECT_NAME}_rt22 ${SRC_FILES}23 )24 25 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})26 27 #non real time executable28 ADD_EXECUTABLE(${PROJECT_NAME}_nrt29 ${SRC_FILES}30 )31 32 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})33 34 INSTALL(35 TARGETS ${PROJECT_NAME}_rt36 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}37 )38 39 INSTALL(40 TARGETS ${PROJECT_NAME}_nrt41 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}42 ) -
trunk/demos/SimpleFleet/simulator/resources/core2-64/simulator_x8.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 $EXEC -n x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair- bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml11 $EXEC -n x8 -a 127.0.0.1 -p 9000 -x simulator_x8.xml -o 10 -m $FLAIR_ROOT/flair-src/models -s $FLAIR_ROOT/flair-src/models/indoor_flight_arena.xml -
trunk/demos/SimpleFleet/uav/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_FILTER TRUE) 6 5 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE) … … 8 7 SET(FLAIR_USE_META TRUE) 9 8 SET(FLAIR_USE_VRPN TRUE) 10 SET(COPY_RESOURCE_FILES true)11 9 12 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 13 include(${FLAIR_USE_FILE}) 10 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 14 11 15 12 SET(SRC_FILES … … 18 15 ) 19 16 20 INCLUDE_DIRECTORIES( 21 ${FLAIR_INCLUDE_DIR} 17 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 18 DEST_DIR SimpleFleet 19 COPY_RESOURCES 22 20 ) 23 24 #real time executable25 ADD_EXECUTABLE(${PROJECT_NAME}_rt26 ${SRC_FILES}27 )28 29 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})30 31 #non real time executable32 ADD_EXECUTABLE(${PROJECT_NAME}_nrt33 ${SRC_FILES}34 )35 36 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})37 38 INSTALL(39 TARGETS ${PROJECT_NAME}_rt40 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}41 )42 43 INSTALL(44 TARGETS ${PROJECT_NAME}_nrt45 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}46 ) -
trunk/demos/SimpleFleet/uav/resources/core2-64/x8_0.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 11 $EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu0 -b 127.255.255.255:20010 -
trunk/demos/SimpleFleet/uav/resources/core2-64/x8_1.sh
r301 r302 7 7 fi 8 8 9 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh9 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 10 10 11 11 $EXEC -n x8_1 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu1 -b 127.255.255.255:20010 -d 21000 -
trunk/demos/Sinus/CMakeLists.txt
r301 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_FILTER TRUE) 6 SET(COPY_RESOURCE_FILES true)7 5 8 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 9 include(${FLAIR_USE_FILE}) 6 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 10 7 11 8 SET(SRC_FILES … … 16 13 ) 17 14 18 LINK_DIRECTORIES ( 19 ${FLAIR_LIBRARY_DIR} 15 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}" 16 DEST_DIR Sinus 17 COPY_RESOURCES 20 18 ) 21 22 INCLUDE_DIRECTORIES(23 ${FLAIR_INCLUDE_DIR}24 )25 26 #real time executable27 ADD_EXECUTABLE(${PROJECT_NAME}_rt28 ${SRC_FILES}29 )30 31 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_rt ${FLAIR_LIBRARIES_RT})32 33 #non real time executable34 ADD_EXECUTABLE(${PROJECT_NAME}_nrt35 ${SRC_FILES}36 )37 38 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})39 40 INSTALL(41 TARGETS ${PROJECT_NAME}_rt42 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}43 )44 45 INSTALL(46 TARGETS ${PROJECT_NAME}_nrt47 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}48 ) -
trunk/demos/Sinus/resources/core2-64/Sinus.sh
r301 r302 6 6 fi 7 7 8 . $FLAIR_ROOT/flair- dev/scripts/distribution_specific_hack.sh8 . $FLAIR_ROOT/flair-src/scripts/distribution_specific_hack.sh 9 9 10 10 $EXEC -
trunk/demos/Skeletons/CustomReferenceAngles/CMakeLists.txt
r297 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_FILTER TRUE) 6 5 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE) … … 8 7 SET(FLAIR_USE_META TRUE) 9 8 10 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 11 include(${FLAIR_USE_FILE}) 9 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 12 10 13 11 SET(SRC_FILES … … 16 14 ) 17 15 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}) 16 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}") -
trunk/demos/Skeletons/CustomTorques/CMakeLists.txt
r297 r302 2 2 cmake_minimum_required(VERSION 2.8) 3 3 4 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)5 4 SET(FLAIR_USE_FILTER TRUE) 6 5 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE) … … 8 7 SET(FLAIR_USE_META TRUE) 9 8 10 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 11 include(${FLAIR_USE_FILE}) 9 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 12 10 13 11 SET(SRC_FILES … … 16 14 ) 17 15 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}) 16 FLAIR_DEMO(${PROJECT_NAME} "${SRC_FILES}") -
trunk/lib/CMakeLists.txt
r297 r302 1 1 PROJECT(FlairLibs) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair- dev/cmake-modules/GlobalCmakeFlair.cmake)3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 4 4 5 5 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/FlairCore) -
trunk/lib/Doxyfile.in
r22 r302 53 53 # where doxygen was started. If left blank the current directory will be used. 54 54 55 OUTPUT_DIRECTORY = $(FLAIR_ROOT)/flair- dev/doc55 OUTPUT_DIRECTORY = $(FLAIR_ROOT)/flair-install/doc 56 56 57 57 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -
trunk/lib/FlairCore/CMakeLists.txt
r297 r302 1 1 PROJECT(FlairCore) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair- dev/cmake-modules/GlobalCmakeFlair.cmake)3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 4 4 5 5 find_package(LibXml2 REQUIRED) 6 7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion8 OUTPUT_VARIABLE GCC_VERSION)9 10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)11 if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)12 ADD_DEFINITIONS("-std=c++11")13 else()14 ADD_DEFINITIONS("-std=c++0x")15 endif()16 else()17 message(STATUS "GCC version < 4.3, c+11 is not supported!")18 endif()19 6 20 7 FILE(GLOB FLAIRCORE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") … … 29 16 30 17 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/nrt) 31 if(NOT WIN32)32 18 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rt) 33 endif()34 35 add_custom_target(36 ${PROJECT_NAME}_compile_info37 COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h38 )39 40 add_dependencies(FlairCore_rt ${PROJECT_NAME}_compile_info)41 add_dependencies(FlairCore_nrt ${PROJECT_NAME}_compile_info) -
trunk/lib/FlairCore/nrt/CMakeLists.txt
r2 r302 3 3 ADD_DEFINITIONS(-D_GNU_SOURCE -D_REENTRANT) 4 4 5 ADD_LIBRARY(${PROJECT_NAME} 6 ${FLAIRCORE_SRC} 7 ) 5 FLAIR_LIB(${PROJECT_NAME} "${FLAIRCORE_SRC}") 8 6 9 INSTALL(TARGETS ${PROJECT_NAME} 10 LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR} 11 ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR} 12 ) 7 #install here, as FLAIR_LIB function will not find .h (in ../src) 8 FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../src/*.h") 9 INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-install/include/FlairCore) -
trunk/lib/FlairCore/rt/CMakeLists.txt
r2 r302 8 8 ) 9 9 10 ADD_LIBRARY(${PROJECT_NAME} 11 ${FLAIRCORE_SRC} 12 ) 10 FLAIR_LIB(${PROJECT_NAME} "${FLAIRCORE_SRC}") 13 11 14 INSTALL(TARGETS ${PROJECT_NAME}15 LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}16 ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}17 )18 19 FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../src/*.h")20 INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/FlairCore) -
trunk/lib/FlairCore/src/Widget.h
r67 r302 15 15 16 16 #include <Object.h> 17 //#include <io_data.h>18 #include <libxml/xpath.h>19 17 20 18 class Widget_impl; 21 19 class FrameworkManager_impl; 20 typedef struct _xmlNode xmlNode; 21 typedef xmlNode *xmlNodePtr; 22 22 23 23 namespace flair { -
trunk/lib/FlairFilter/CMakeLists.txt
r297 r302 1 1 PROJECT(FlairFilter) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 4 5 find_package(LibXml2 REQUIRED) 6 7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion 8 OUTPUT_VARIABLE GCC_VERSION) 9 10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) 11 if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7) 12 ADD_DEFINITIONS("-std=c++11") 13 else() 14 ADD_DEFINITIONS("-std=c++0x") 15 endif() 16 else() 17 message(STATUS "GCC version < 4.3, c+11 is not supported!") 18 endif() 3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 19 4 20 5 INCLUDE_DIRECTORIES( 21 ${LIBXML2_INCLUDE_DIR}22 6 ${CMAKE_CURRENT_SOURCE_DIR}/../FlairCore/src 23 7 ${CMAKE_CURRENT_SOURCE_DIR}/../FlairSensorActuator/src … … 30 14 FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") 31 15 32 ADD_LIBRARY(${PROJECT_NAME} 33 ${SRC_FILES}16 FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}" 17 INCLUDES_DEST_DIR ${PROJECT_NAME} 34 18 ) 35 36 INSTALL(TARGETS ${PROJECT_NAME}37 LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}38 ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}39 )40 41 #copie des entetes42 FILE(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")43 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})44 45 add_custom_target(46 ${PROJECT_NAME}_compile_info47 COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h48 )49 50 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info) -
trunk/lib/FlairMeta/CMakeLists.txt
r297 r302 1 1 PROJECT(FlairMeta) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 4 5 find_package(LibXml2 REQUIRED) 6 7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion 8 OUTPUT_VARIABLE GCC_VERSION) 9 10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) 11 if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7) 12 ADD_DEFINITIONS("-std=c++11") 13 else() 14 ADD_DEFINITIONS("-std=c++0x") 15 endif() 16 else() 17 message(STATUS "GCC version < 4.3, c+11 is not supported!") 18 endif() 3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 19 4 20 5 INCLUDE_DIRECTORIES( 21 ${LIBXML2_INCLUDE_DIR}22 6 ${CMAKE_CURRENT_SOURCE_DIR}/../FlairCore/src 23 7 ${CMAKE_CURRENT_SOURCE_DIR}/../FlairSensorActuator/src … … 30 14 FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") 31 15 32 ADD_LIBRARY(${PROJECT_NAME} 33 ${SRC_FILES}16 FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}" 17 INCLUDES_DEST_DIR ${PROJECT_NAME} 34 18 ) 35 36 INSTALL(TARGETS ${PROJECT_NAME}37 LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}38 ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}39 )40 41 #copie des entetes42 FILE(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")43 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})44 45 add_custom_target(46 ${PROJECT_NAME}_compile_info47 COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h48 )49 50 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info) -
trunk/lib/FlairSensorActuator/CMakeLists.txt
r297 r302 1 1 PROJECT(FlairSensorActuator) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 4 5 find_package(LibXml2 REQUIRED) 6 7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion 8 OUTPUT_VARIABLE GCC_VERSION) 9 10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) 11 if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7) 12 ADD_DEFINITIONS("-std=c++11") 13 else() 14 ADD_DEFINITIONS("-std=c++0x") 15 endif() 16 else() 17 message(STATUS "GCC version < 4.3, c+11 is not supported!") 18 endif() 3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 19 4 20 5 INCLUDE_DIRECTORIES( 21 ${LIBXML2_INCLUDE_DIR}22 6 ${CMAKE_CURRENT_SOURCE_DIR}/src 23 7 ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported … … 28 12 ) 29 13 30 FILE(GLOB S ENSOR_SRC"${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")14 FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") 31 15 32 ADD_LIBRARY(${PROJECT_NAME} 33 ${SENSOR_SRC}16 FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}" 17 INCLUDES_DEST_DIR ${PROJECT_NAME} 34 18 ) 35 36 INSTALL(TARGETS ${PROJECT_NAME}37 LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}38 ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}39 )40 41 FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")42 INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})43 44 add_custom_target(45 ${PROJECT_NAME}_compile_info46 COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h47 )48 49 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info) -
trunk/lib/FlairSimulator/CMakeLists.txt
r297 r302 1 1 PROJECT(FlairSimulator) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair- dev/cmake-modules/GlobalCmakeFlair.cmake)3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 4 4 5 5 find_package(LibXml2 REQUIRED) 6 6 7 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion8 OUTPUT_VARIABLE GCC_VERSION)9 10 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)11 if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)12 ADD_DEFINITIONS("-std=c++11")13 else()14 ADD_DEFINITIONS("-std=c++0x")15 endif()16 else()17 message(STATUS "GCC version < 4.3, c+11 is not supported!")18 endif()19 20 7 INCLUDE_DIRECTORIES( 21 8 ${LIBXML2_INCLUDE_DIR} 22 9 ${CMAKE_CURRENT_SOURCE_DIR}/src 23 10 ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported … … 29 16 ) 30 17 31 FILE(GLOB SIMU_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") 32 33 add_custom_target( 34 ${PROJECT_NAME}_compile_info 35 COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h 36 ) 18 FILE(GLOB FLAIRSIMU_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") 37 19 38 20 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/no_gl) 39 add_dependencies(FlairSimulator_nogl ${PROJECT_NAME}_compile_info)40 21 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") 41 22 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gl) 42 add_dependencies(FlairSimulator_gl ${PROJECT_NAME}_compile_info)43 23 endif() -
trunk/lib/FlairSimulator/gl/CMakeLists.txt
r8 r302 3 3 ADD_DEFINITIONS(-D_GNU_SOURCE -D_REENTRANT -DGL) 4 4 5 6 ADD_LIBRARY(${PROJECT_NAME} 7 ${SIMU_SRC} 8 ) 9 10 INSTALL(TARGETS ${PROJECT_NAME} 11 LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR} 12 ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR} 13 ) 5 FLAIR_LIB(${PROJECT_NAME} "${FLAIRSIMU_SRC}") -
trunk/lib/FlairSimulator/no_gl/CMakeLists.txt
r8 r302 3 3 ADD_DEFINITIONS(-D_GNU_SOURCE -D_REENTRANT) 4 4 5 ADD_LIBRARY(${PROJECT_NAME} 6 ${SIMU_SRC} 7 ) 5 FLAIR_LIB(${PROJECT_NAME} "${FLAIRSIMU_SRC}") 8 6 9 INSTALL(TARGETS ${PROJECT_NAME} 10 LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR} 11 ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR} 12 ) 13 7 #install here, as FLAIR_LIB function will not find .h (in ../src) 14 8 FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/../src/*.h") 15 INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair- dev/include/FlairSimulator)9 INSTALL(FILES ${files} DESTINATION $ENV{FLAIR_ROOT}/flair-install/include/FlairSimulator) -
trunk/lib/FlairSimulator/src/Parser.cpp
r167 r302 27 27 #include <IGeometryCreator.h> 28 28 #include <ISceneManager.h> 29 #include <libxml/parser.h> 30 #include <libxml/tree.h> 29 31 30 32 using namespace irr; -
trunk/lib/FlairSimulator/src/Parser.h
r167 r302 20 20 #include <Gui.h> 21 21 #include <Vector3D.h> 22 #include <libxml/parser.h>23 #include <libxml/tree.h>24 22 #include <SColor.h> 23 24 //todo make a pimpl to remove these forward declaration 25 typedef struct _xmlNode xmlNode; 26 typedef unsigned char xmlChar; 27 typedef struct _xmlDoc xmlDoc; 25 28 26 29 namespace flair { -
trunk/lib/FlairVisionFilter/CMakeLists.txt
r300 r302 1 1 PROJECT(FlairVisionFilter) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake) 4 5 #if(NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te") 6 7 find_package(LibXml2 REQUIRED) 8 9 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion 10 OUTPUT_VARIABLE GCC_VERSION) 11 12 if (GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3) 13 if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7) 14 ADD_DEFINITIONS("-std=c++11") 15 else() 16 ADD_DEFINITIONS("-std=c++0x") 17 endif() 18 else() 19 message(STATUS "GCC version < 4.3, c+11 is not supported!") 20 endif() 3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 21 4 22 5 INCLUDE_DIRECTORIES( 23 ${LIBXML2_INCLUDE_DIR}24 6 ${CMAKE_CURRENT_SOURCE_DIR}/src 25 ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported26 7 ${CMAKE_CURRENT_SOURCE_DIR}/../FlairCore/src 27 8 ${CMAKE_CURRENT_SOURCE_DIR}/../FlairFilter/src … … 29 10 ) 30 11 31 FILE(GLOB SRC_ SRC"${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")12 FILE(GLOB SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") 32 13 33 ADD_LIBRARY(${PROJECT_NAME} 34 ${SRC_SRC}14 FLAIR_LIB(${PROJECT_NAME} "${SRC_FILES}" 15 INCLUDES_DEST_DIR ${PROJECT_NAME} 35 16 ) 36 37 INSTALL(TARGETS ${PROJECT_NAME}38 LIBRARY DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}39 ARCHIVE DESTINATION $ENV{FLAIR_ROOT}/flair-bin/lib/${ARCH_DIR}40 )41 42 FILE(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")43 INSTALL(FILES ${HEADER_FILES} DESTINATION $ENV{FLAIR_ROOT}/flair-dev/include/${PROJECT_NAME})44 45 add_custom_target(46 ${PROJECT_NAME}_compile_info47 COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h48 )49 50 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)51 52 #else()53 # if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)54 # warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE} architecture")55 # else()56 # warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")57 # endif()58 #endif() -
trunk/tools/CMakeLists.txt
r297 r302 1 1 PROJECT(FlairTools) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair- dev/cmake-modules/GlobalCmakeFlair.cmake)3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 4 4 5 5 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Controller/DualShock3) -
trunk/tools/Controller/DualShock3/CMakeLists.txt
r107 r302 1 1 PROJECT(dualshock3) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair- dev/cmake-modules/GlobalCmakeFlair.cmake)3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 4 4 5 5 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") 6 6 7 7 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE) 8 include(${FLAIR_USE_FILE})9 8 10 9 ADD_DEFINITIONS(-fpermissive) 11 10 12 INCLUDE_DIRECTORIES( 13 ${FLAIR_INCLUDE_DIR} 14 ${CMAKE_SOURCE_DIR}/src 15 ) 16 17 LINK_DIRECTORIES ( 18 ${FLAIR_LIBRARY_DIR} 19 ) 20 21 ADD_EXECUTABLE(${PROJECT_NAME} 11 SET(SRC_FILES 22 12 src/DualShock3.cpp 23 13 src/main.cpp 24 14 ) 25 15 26 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${FLAIR_LIBRARIES_NRT} bluetooth usb)16 FLAIR_NRT_TOOL(${PROJECT_NAME} "${SRC_FILES}") 27 17 28 INSTALL( 29 TARGETS ${PROJECT_NAME} 30 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/tools/${ARCH_DIR} 31 ) 32 33 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) 18 TARGET_LINK_LIBRARIES(${PROJECT_NAME} bluetooth usb) 34 19 35 20 else() -
trunk/tools/Controller/Mavlink/CMakeLists.txt
r107 r302 1 1 PROJECT(MavPlanner) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair- dev/cmake-modules/GlobalCmakeFlair.cmake)3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 4 4 5 5 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") 6 6 7 include(${FLAIR_USE_FILE})8 9 ADD_DEFINITIONS(-fpermissive)10 11 7 INCLUDE_DIRECTORIES( 12 ${FLAIR_INCLUDE_DIR}13 ${CMAKE_SOURCE_DIR}/src14 8 ${CMAKE_SOURCE_DIR}/src/mavlink_generated_messages/common 15 9 ) … … 17 11 FILE(GLOB MAVPLANNER_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") 18 12 19 ADD_EXECUTABLE(${PROJECT_NAME} 20 ${MAVPLANNER_SRC} 21 ) 22 23 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${FLAIR_LIBRARIES_NRT}) 24 25 INSTALL( 26 TARGETS ${PROJECT_NAME} 27 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/tools/${ARCH_DIR} 28 ) 29 30 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) 13 FLAIR_NRT_TOOL(${PROJECT_NAME} "${MAVPLANNER_SRC}") 31 14 32 15 else() -
trunk/tools/Dbt2csv/CMakeLists.txt
r234 r302 1 1 PROJECT(dbt2csv) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair- dev/cmake-modules/GlobalCmakeFlair.cmake)3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 4 4 5 5 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") … … 29 29 ../FlairGCS/src/ 30 30 ${QT_INCLUDE_DIR} 31 ${CMAKE_BINARY_DIR}/generated/ 31 32 ) 32 33 … … 40 41 INSTALL( 41 42 TARGETS ${PROJECT_NAME} 42 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair- bin/tools/${ARCH_DIR}43 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-install/tools/${ARCH_DIR} 43 44 ) 44 45 45 46 add_custom_target( 46 47 compile_info 47 COMMAND $ENV{FLAIR_ROOT}/flair- dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h48 COMMAND $ENV{FLAIR_ROOT}/flair-src/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/generated/compile_info.h 48 49 ) 49 50 -
trunk/tools/FlairGCS/CMakeLists.txt
r297 r302 1 1 PROJECT(flairgcs) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair- dev/cmake-modules/GlobalCmakeFlair.cmake)3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 4 4 5 5 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") … … 65 65 ${CMAKE_SYSROOT}/usr/include/qt4/QtMobility 66 66 ${CMAKE_SYSROOT}/usr/include/qt4/QtLocation 67 ${CMAKE_BINARY_DIR}/generated/ 67 68 ) 68 69 … … 76 77 INSTALL( 77 78 TARGETS ${PROJECT_NAME} 78 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair- bin/tools/${ARCH_DIR}79 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-install/bin/tools/${ARCH_DIR} 79 80 ) 80 81 81 82 add_custom_target( 82 83 ${PROJECT_NAME}_compile_info 83 COMMAND $ENV{FLAIR_ROOT}/flair- dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h84 COMMAND $ENV{FLAIR_ROOT}/flair-src/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/generated/compile_info.h 84 85 ) 85 86 -
trunk/tools/VrpnBridge/CMakeLists.txt
r232 r302 1 1 PROJECT(vrnbridge) 2 2 cmake_minimum_required(VERSION 2.8) 3 include($ENV{FLAIR_ROOT}/flair- dev/cmake-modules/GlobalCmakeFlair.cmake)3 include($ENV{FLAIR_ROOT}/flair-src/cmake-modules/GlobalCmakeFlair.cmake) 4 4 5 5 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") … … 18 18 INSTALL( 19 19 TARGETS ${PROJECT_NAME} 20 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair- bin/tools/${ARCH_DIR}20 RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-install/bin/tools/${ARCH_DIR} 21 21 ) 22 22
Note:
See TracChangeset
for help on using the changeset viewer.
