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


Ignore:
Timestamp:
Mar 6, 2018, 12:14:17 PM (4 years ago)
Author:
Sanahuja Guillaume
Message:

maj for armv5te

Location:
trunk/cmake-modules
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/cmake-modules/ArchDir.cmake

    r2 r68  
    1 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
    2         SET(ARCH_DIR "arm")
    3 elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "powerpc")
    4           SET(ARCH_DIR "powerpc")
     1if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686")
     2    message(FATAL_ERROR "i686 is not supported")
     3endif()
     4
     5if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
     6    SET(ARCH_DIR "x86_64/unix")
     7elseif(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
     8    SET(ARCH_DIR ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE})
    59else()
    6         if(WIN32)
    7                 if(MINGW)
    8                         if (CMAKE_SIZEOF_VOID_P MATCHES "8")#64 bits
    9                                 SET(ARCH_DIR "x86_64/win")
    10                         else()#32 bits
    11                                 SET(ARCH_DIR "x86/win")
    12                                 ADD_DEFINITIONS(-D__MINGW__)
    13                         endif()
    14                 else()
    15                         message(FATAL_ERROR,"only supports mingw compiler")
    16                 endif()
    17         else() 
    18                 if (CMAKE_SIZEOF_VOID_P MATCHES "8")#64 bits
    19                         SET(ARCH_DIR "x86_64/unix")
    20                 else()#32 bits
    21                         SET(ARCH_DIR "i686/unix")
    22                 endif()
    23         endif()
     10    SET(ARCH_DIR ${CMAKE_SYSTEM_PROCESSOR})
    2411endif()
  • trunk/cmake-modules/FlairUseFile.cmake

    r67 r68  
    3131        ${LIBXML2_INCLUDE_DIR} 
    3232        ${CMAKE_SYSROOT}/usr/include/opencv1
     33    ${CMAKE_SYSROOT}/usr/include/opencv
    3334        ${FLAIR_DEV}/include/FlairCore
    3435)
     
    6263#vision filter lib
    6364IF (FLAIR_USE_VISION_FILTER)
    64         if(FOUND_HDS_DIR)
     65    if(FOUND_HDS_DIR AND NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")
    6566                SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-hds/dev/include/VisionFilter)
    6667                SET(FLAIR_LIBRARIES ${FLAIRHDS_LIBRARY_DIR}/libVisionFilter.a ${FLAIRHDS_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES})
    6768  else()
    68     SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-dev/include/FlairVisionFilter)
     69        SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-dev/include/FlairVisionFilter)
    6970                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairVisionFilter.a ${FLAIR_LIBRARIES})
    7071        endif()
     
    9899                ${FLAIR_DEV}/include/FlairSimulator
    99100                ${CMAKE_SYSROOT}/usr/include/irrlicht
    100                 ${FLAIR_DEV}/include/FlairSensorActuator
    101101                )
    102102       
    103         SET(SIMU_LIBRARY ${FLAIR_LIBRARY_DIR}/libFlairSensorActuator.a)
    104103        IF (FLAIR_USE_SIMULATOR_GL)
    105104                ADD_DEFINITIONS("-DGL")
    106                 SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_gl.a ${SIMU_LIBRARY} GL ${FLAIR_LIBRARIES} Irrlicht Xxf86vm)
     105                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_gl.a GL ${FLAIR_LIBRARIES} Irrlicht Xxf86vm)
    107106        else()
    108                 SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_nogl.a ${SIMU_LIBRARY} ${FLAIR_LIBRARIES})
     107                SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairSimulator_nogl.a ${FLAIR_LIBRARIES})
    109108        endif()
    110109ENDIF (FLAIR_USE_SIMULATOR)
     
    127126endif()
    128127
    129 #add ardrone2 and bebop lib
    130 if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")     
     128#add ardrone2, bebop or minidrones lib
     129if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv7a-neon") 
    131130  SET (PARROT_LIB -Wl,--whole-archive ${FLAIRHDS_LIBRARY_DIR}/libFlairArdrone2.a ${FLAIRHDS_LIBRARY_DIR}/libFlairBebop.a -Wl,--no-whole-archive)
     131        set(FLAIR_LIBRARIES_NRT ${PARROT_LIB} ${FLAIR_LIBRARIES_NRT} nmea)
     132endif()
     133if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")     
     134  SET (PARROT_LIB -Wl,--whole-archive ${FLAIRHDS_LIBRARY_DIR}/libFlairMinidrones.a -Wl,--no-whole-archive)
    132135        set(FLAIR_LIBRARIES_NRT ${PARROT_LIB}  ${FLAIR_LIBRARIES_NRT} nmea)
    133136endif()
Note: See TracChangeset for help on using the changeset viewer.