Changeset 107 in flair-src for trunk/tools/Controller

Timestamp:

Nov 3, 2016, 11:11:54 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/tools/Controller

Files:

• DualShock3/CMakeLists.txt (modified) (2 diffs)
• Mavlink/CMakeLists.txt (modified) (2 diffs)

trunk/tools/Controller/DualShock3/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(dualshock3)
 cmake_minimum_required(VERSION 2.8)
+include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
+
+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
 
 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
-
-include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
 include(${FLAIR_USE_FILE})
 
@@ -31 +32 @@
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+
+else()
+warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
+endif()

trunk/tools/Controller/Mavlink/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(MavPlanner)
 cmake_minimum_required(VERSION 2.8)
+include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
 
-include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
+
 include(${FLAIR_USE_FILE})
 
@@ -27 +29 @@
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+
+else()
+warn("${PROJECT_NAME} will not be built for ${CMAKE_SYSTEM_PROCESSOR} architecture")
+endif()