Changeset 224 in flair-src for trunk/demos/OpticalFlow

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

maj for armv5te

Location:

trunk/demos/OpticalFlow

Files:

• simulator/CMakeLists.txt (modified) (1 diff)
• uav/CMakeLists.txt (modified) (3 diffs)

trunk/demos/OpticalFlow/simulator/CMakeLists.txt

@@ -5 +5 @@
 SET(FLAIR_USE_SIMULATOR TRUE)
 SET(FLAIR_USE_SIMULATOR_GL TRUE)
-SET(FLAIR_USE_VISION_FILTER TRUE)
+#SET(FLAIR_USE_VISION_FILTER TRUE)
 
 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)

trunk/demos/OpticalFlow/uav/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(OpticalFlow)
 cmake_minimum_required(VERSION 2.8)
+include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
+
+if(NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
@@ -8 +11 @@
 SET(FLAIR_USE_META TRUE)
 
-include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
 include(${FLAIR_USE_FILE})
 
@@ -33 +35 @@
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME}_nrt ${FLAIR_LIBRARIES_NRT})
+
+else()
+    if(DEFINED CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE)
+        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE} architecture")
+    else()
+        warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
+    endif()
+endif()