Changeset 83 in flair-dev for trunk

Timestamp:

Nov 30, 2018, 5:01:28 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

opencv

File:

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

trunk/cmake-modules/FlairUseFile.cmake

@@ -31 +31 @@
         ${LIBXML2_INCLUDE_DIR}  
         ${CMAKE_SYSROOT}/usr/include/opencv1
-    ${CMAKE_SYSROOT}/usr/include/opencv
         ${FLAIR_DEV}/include/FlairCore
 )
@@ -63 +62 @@
 #vision filter lib
 IF (FLAIR_USE_VISION_FILTER)
-    if(FOUND_HDS_DIR AND NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")
+    if(FOUND_HDS_DIR AND ("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv7a-neon" OR "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64"))
+        message("using libdspcv_gpp.a for vision filter")
                 SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-hds/dev/include/VisionFilter)
                 SET(FLAIR_LIBRARIES ${FLAIRHDS_LIBRARY_DIR}/libVisionFilter.a ${FLAIRHDS_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES})