Changeset 416 in flair-src for trunk

Timestamp:

04/13/21 16:41:46 (3 years ago)

Author:

Sanahuja Guillaume

Message:

add intel aero

File:

• trunk/cmake-modules/FlairUseFile.cmake (modified) (2 diffs)

trunk/cmake-modules/FlairUseFile.cmake

@@ -135 +135 @@
 
 #add arch specific uav lib lib
+if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")     
+  SET (AERO_LIB -Wl,--whole-archive ${FLAIR_LIBRARY_DIR}/libFlairIntelAero.a -Wl,--no-whole-archive)
+        set(FLAIR_LIBRARIES_NRT ${AERO_LIB} ${FLAIR_LIBRARIES_NRT} nmea)
+    set(FLAIR_LIBRARIES_RT ${AERO_LIB} ${FLAIR_LIBRARIES_RT} nmea)
+endif()
+
 if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv7a-neon")  
   SET (PARROT_LIB -Wl,--whole-archive ${FLAIR_LIBRARY_DIR}/libFlairArdrone2.a ${FLAIR_LIBRARY_DIR}/libFlairBebop.a -Wl,--no-whole-archive)
@@ -146 +152 @@
 endif()
 if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "cortexa8hf-neon")      
-  SET (PARROT_LIB -Wl,--whole-archive ${FLAIR_LIBRARY_DIR}/libFlairBeagleBlue.a -Wl,--no-whole-archive)
-        set(FLAIR_LIBRARIES_NRT ${PARROT_LIB}  ${FLAIR_LIBRARIES_NRT})
-    set(FLAIR_LIBRARIES_RT ${PARROT_LIB}  ${FLAIR_LIBRARIES_RT})
+  SET (BEAGLE_LIB -Wl,--whole-archive ${FLAIR_LIBRARY_DIR}/libFlairBeagleBlue.a -Wl,--no-whole-archive)
+        set(FLAIR_LIBRARIES_NRT ${BEAGLE_LIB}  ${FLAIR_LIBRARIES_NRT})
+    set(FLAIR_LIBRARIES_RT ${BEAGLE_LIB}  ${FLAIR_LIBRARIES_RT})
 endif()