Changeset 68 in flair-dev for trunk/cmake-modules

Timestamp:

Mar 6, 2018, 12:14:17 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

maj for armv5te

Location:

trunk/cmake-modules

Files:

• ArchDir.cmake (modified) (1 diff)
• FlairUseFile.cmake (modified) (4 diffs)

trunk/cmake-modules/ArchDir.cmake

@@ -1 @@
-if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
-        SET(ARCH_DIR "arm")
-elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "powerpc")
-          SET(ARCH_DIR "powerpc")
+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686")
+    message(FATAL_ERROR "i686 is not supported")
+endif()
+
+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
+    SET(ARCH_DIR "x86_64/unix")
+elseif(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
+    SET(ARCH_DIR ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE})
 else()
-        if(WIN32)
-                if(MINGW)
-                        if (CMAKE_SIZEOF_VOID_P MATCHES "8")#64 bits
-                                SET(ARCH_DIR "x86_64/win")
-                        else()#32 bits
-                                SET(ARCH_DIR "x86/win")
-                                ADD_DEFINITIONS(-D__MINGW__)
-                        endif()
-                else()
-                        message(FATAL_ERROR,"only supports mingw compiler")
-                endif()
-        else()  
-                if (CMAKE_SIZEOF_VOID_P MATCHES "8")#64 bits
-                        SET(ARCH_DIR "x86_64/unix")
-                else()#32 bits
-                        SET(ARCH_DIR "i686/unix")
-                endif()
-        endif()
+    SET(ARCH_DIR ${CMAKE_SYSTEM_PROCESSOR})
 endif()

trunk/cmake-modules/FlairUseFile.cmake

@@ -31 +31 @@
         ${LIBXML2_INCLUDE_DIR}  
         ${CMAKE_SYSROOT}/usr/include/opencv1
+    ${CMAKE_SYSROOT}/usr/include/opencv
         ${FLAIR_DEV}/include/FlairCore
 )
@@ -62 +63 @@
 #vision filter lib
 IF (FLAIR_USE_VISION_FILTER)
-        if(FOUND_HDS_DIR)
+    if(FOUND_HDS_DIR AND NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")
                 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})
   else()
-    SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-dev/include/FlairVisionFilter)
+        SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-dev/include/FlairVisionFilter)
                 SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairVisionFilter.a ${FLAIR_LIBRARIES})
         endif()
@@ -98 +99 @@
                 ${FLAIR_DEV}/include/FlairSimulator
                 ${CMAKE_SYSROOT}/usr/include/irrlicht
-                ${FLAIR_DEV}/include/FlairSensorActuator
                 )
         
-        SET(SIMU_LIBRARY ${FLAIR_LIBRARY_DIR}/libFlairSensorActuator.a)
         IF (FLAIR_USE_SIMULATOR_GL)
                 ADD_DEFINITIONS("-DGL")
-                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_gl.a ${SIMU_LIBRARY} GL ${FLAIR_LIBRARIES} Irrlicht Xxf86vm)
+                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_gl.a GL ${FLAIR_LIBRARIES} Irrlicht Xxf86vm)
         else()
-                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_nogl.a ${SIMU_LIBRARY} ${FLAIR_LIBRARIES})
+                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_nogl.a ${FLAIR_LIBRARIES})
         endif()
 ENDIF (FLAIR_USE_SIMULATOR)
@@ -127 +126 @@
 endif()
 
-#add ardrone2 and bebop lib
-if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")      
+#add ardrone2, bebop or minidrones lib
+if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv7a-neon")  
   SET (PARROT_LIB -Wl,--whole-archive ${FLAIRHDS_LIBRARY_DIR}/libFlairArdrone2.a ${FLAIRHDS_LIBRARY_DIR}/libFlairBebop.a -Wl,--no-whole-archive)
+        set(FLAIR_LIBRARIES_NRT ${PARROT_LIB} ${FLAIR_LIBRARIES_NRT} nmea)
+endif()
+if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")      
+  SET (PARROT_LIB -Wl,--whole-archive ${FLAIRHDS_LIBRARY_DIR}/libFlairMinidrones.a -Wl,--no-whole-archive)
         set(FLAIR_LIBRARIES_NRT ${PARROT_LIB}  ${FLAIR_LIBRARIES_NRT} nmea)
 endif()