Changeset 300 in flair-src for trunk

Timestamp:

Feb 4, 2019, 12:07:35 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk

Files:

• demos/OpticalFlow/CMakeLists.txt (modified) (1 diff)
• lib/FlairVisionFilter/CMakeLists.txt (modified) (2 diffs)
• tools/Controller/DualShock3/src/DualShock3.cpp (modified) (1 diff)
• tools/Controller/Mavlink/src/GuiGcs.cpp (modified) (1 diff)
• tools/Controller/Mavlink/src/GuiInterface.cpp (modified) (1 diff)

trunk/demos/OpticalFlow/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(OpticalFlow)
+
+if(NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/simulator)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/uav)
+
+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()

trunk/lib/FlairVisionFilter/CMakeLists.txt

@@ -3 +3 @@
 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
 
-if(NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")
+#if(NOT "${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "armv5te")
 
 find_package(LibXml2 REQUIRED)
@@ -50 +50 @@
 add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_compile_info)
 
-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()
+#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()

trunk/tools/Controller/DualShock3/src/DualShock3.cpp

@@ -27 +27 @@
 #include <GroupBox.h>
 #include <FrameworkManager.h>
-#include <Socket.h>
 #include <sstream>
 

trunk/tools/Controller/Mavlink/src/GuiGcs.cpp

@@ -19 +19 @@
 #include "GuiGcs.h"
 #include "GuiInterface.h"
-
-#include <Socket.h>
 
 #include "MavlinkUDP.h"

trunk/tools/Controller/Mavlink/src/GuiInterface.cpp

@@ -20 +20 @@
 #include <cvmatrix.h>
 #include <FrameworkManager.h>
-#include <Socket.h>
 #include <Thread.h>