Changeset 68 in flair-dev for trunk/cmake-modules/FlairUseFile.cmake
- Timestamp:
- 03/06/18 12:14:17 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/cmake-modules/FlairUseFile.cmake
r67 r68 31 31 ${LIBXML2_INCLUDE_DIR} 32 32 ${CMAKE_SYSROOT}/usr/include/opencv1 33 ${CMAKE_SYSROOT}/usr/include/opencv 33 34 ${FLAIR_DEV}/include/FlairCore 34 35 ) … … 62 63 #vision filter lib 63 64 IF (FLAIR_USE_VISION_FILTER) 64 if(FOUND_HDS_DIR)65 if(FOUND_HDS_DIR AND NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te") 65 66 SET(FLAIR_INCLUDE_DIR ${FLAIR_INCLUDE_DIR} $ENV{FLAIR_ROOT}/flair-hds/dev/include/VisionFilter) 66 67 SET(FLAIR_LIBRARIES ${FLAIRHDS_LIBRARY_DIR}/libVisionFilter.a ${FLAIRHDS_LIBRARY_DIR}/libdspcv_gpp.a ${FLAIR_LIBRARIES}) 67 68 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) 69 70 SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libFlairVisionFilter.a ${FLAIR_LIBRARIES}) 70 71 endif() … … 98 99 ${FLAIR_DEV}/include/FlairSimulator 99 100 ${CMAKE_SYSROOT}/usr/include/irrlicht 100 ${FLAIR_DEV}/include/FlairSensorActuator101 101 ) 102 102 103 SET(SIMU_LIBRARY ${FLAIR_LIBRARY_DIR}/libFlairSensorActuator.a)104 103 IF (FLAIR_USE_SIMULATOR_GL) 105 104 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) 107 106 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}) 109 108 endif() 110 109 ENDIF (FLAIR_USE_SIMULATOR) … … 127 126 endif() 128 127 129 #add ardrone2 and beboplib130 if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR }" MATCHES "arm")128 #add ardrone2, bebop or minidrones lib 129 if(FOUND_HDS_DIR AND FLAIR_USE_META AND "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv7a-neon") 131 130 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) 132 endif() 133 if(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) 132 135 set(FLAIR_LIBRARIES_NRT ${PARROT_LIB} ${FLAIR_LIBRARIES_NRT} nmea) 133 136 endif()
Note:
See TracChangeset
for help on using the changeset viewer.