fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-22 01:10:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Requested changes.

Browse Source
This commit is contained in:
James Goppert
2015-10-05 17:56:48 -04:00
parent 86c3397b1b
commit 562d308712
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+7 -2
View File
@@ -9,6 +9,11 @@ project(uavcan C CXX)
#============================================================================= #=============================================================================
# build options # build options
# #
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(DEFAULT_UAVCAN_PLATFORM "linux")
endif()
# options are listed in a table format below # options are listed in a table format below
set(opts set(opts
# name: type: default value: string options list : description # name: type: default value: string options list : description
@@ -66,12 +71,12 @@ install(DIRECTORY dsdl DESTINATION share/uavcan)
add_subdirectory(libuavcan) add_subdirectory(libuavcan)
# drivers # drivers
add_subdirectory(libuavcan_drivers/posix)
if (${UAVCAN_PLATFORM} STREQUAL "linux") if (${UAVCAN_PLATFORM} STREQUAL "linux")
message(STATUS "Adding Linux support library") message(STATUS "Adding Linux support library")
add_subdirectory(libuavcan_drivers/posix)
add_subdirectory(libuavcan_drivers/linux) add_subdirectory(libuavcan_drivers/linux)
elseif(${UAVCAN_PLATFORM} STREQUAL "stm32") elseif(${UAVCAN_PLATFORM} STREQUAL "stm32")
add_subdirectory(libuavcan_drivers/posix)
add_subdirectory(libuavcan_drivers/stm32/driver) add_subdirectory(libuavcan_drivers/stm32/driver)
endif() endif()
libuavcan/CMakeLists.txt
+1 -1
View File
@@ -47,7 +47,7 @@ if (COMPILER_IS_GCC_COMPATIBLE)
message(STATUS "Using C++03") message(STATUS "Using C++03")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03 -Wno-variadic-macros -Wno-long-long") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03 -Wno-variadic-macros -Wno-long-long")
else () else ()
message(STATUS "Using C++11 (pass USE_CPP03=1 to override)") message(STATUS "Using C++11 (pass UAVCAN_USE_CPP03=1 to override)")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif () endif ()
endif () endif ()