Index: /trunk/cmake-modules/FlairUseFile.cmake =================================================================== --- /trunk/cmake-modules/FlairUseFile.cmake (revision 25) +++ /trunk/cmake-modules/FlairUseFile.cmake (revision 26) @@ -103,2 +103,22 @@ endif() +#check if we have a flair-hds directory +if (IS_DIRECTORY $ENV{FLAIR_ROOT}/flair-hds ) + message("found flair-hds directory") + SET(FLAIRHDS_LIBRARY_DIR + $ENV{FLAIR_ROOT}/flair-hds/bin/lib/${ARCH_DIR} + ) + + if(FLAIR_USE_FILTER) + SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-hds/dev/include/VisionFilter) + SET(FLAIR_LIBRARIES_NRT ${FLAIRHDS_LIBRARY_DIR}/libVisionFilter.a ${FLAIRHDS_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES_NRT}) + SET(FLAIR_LIBRARIES_RT ${FLAIRHDS_LIBRARY_DIR}/libVisionFilter.a ${FLAIRHDS_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES_RT}) + endif() + + if(FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm") + SET (ARDRONE2_LIB -Wl,--whole-archive ${FLAIRHDS_LIBRARY_DIR}/libFlairArdrone2.a -Wl,--no-whole-archive) + set(FLAIR_LIBRARIES_NRT ${ARDRONE2_LIB} ${FLAIR_LIBRARIES_NRT} nmea) + SET(FLAIR_LIBRARY_DIR ${FLAIR_LIBRARY_DIR} $ENV{FLAIR_ROOT}/flair-hds/bin/lib/${ARCH_DIR}) + + endif() +endif() Index: /trunk/doc/Flair/_afro_bldc_8h.html =================================================================== --- /trunk/doc/Flair/_afro_bldc_8h.html (revision 25) +++ /trunk/doc/Flair/_afro_bldc_8h.html (revision 26) @@ -150,6 +150,6 @@
Class displaying a QCheckBox on the ground station. +
Class displaying a QCheckBox on the ground station. More...
#include <Box.h>
Class displaying a QCheckBox on the ground station.
+Class displaying a QCheckBox on the ground station.
Class displaying a QComboBox on the ground station. +
Class displaying a QComboBox on the ground station. More...
#include <Box.h>
Class displaying a QComboBox on the ground station.
+Class displaying a QComboBox on the ground station.
Class displaying a QDoubleSpinBox on the ground station. +
Class displaying a QDoubleSpinBox on the ground station. More...
#include <Box.h>
Class displaying a QDoubleSpinBox on the ground station.
+Class displaying a QDoubleSpinBox on the ground station.
+ |
+ Flair
+
+ Framework Libre Air
+ |
+
Class displaying a QGridLayout on the ground station. +
Class displaying a QGridLayout on the ground station. More...
#include <Layout.h>
Class displaying a QGridLayout on the ground station.
+Class displaying a QGridLayout on the ground station.
Class displaying a QGroupBox on the ground station. +
Class displaying a QGroupBox on the ground station. More...
#include <Layout.h>
Class displaying a QGroupBox on the ground station.
+Class displaying a QGroupBox on the ground station.
Class displaying a QLabel on the ground station. +
Class displaying a QLabel on the ground station. More...
#include <Widget.h>
Class displaying a QLabel on the ground station.
+Class displaying a QLabel on the ground station.