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

Merge branch 'cmake-2' of https://github.com/jgoppert/Firmware into cmake2

Browse Source
This commit is contained in:
Mark Charlebois
2015-09-07 21:10:58 -07:00
parent 4764a62440 852c72fdc7
commit d798869ff8
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/px4_nuttx_utils.cmake
+8 -8
View File
@@ -278,12 +278,12 @@ endfunction()
#=============================================================================
#
# px4_add_flags
# px4_os_add_flags
#
# Set ths nuttx build flags.
#
# Usage:
# px4_add_flags(
# px4_os_add_flags(
# C_FLAGS <inout-variable>
# CXX_FLAGS <inout-variable>
# EXE_LINKER_FLAGS <inout-variable>
@@ -303,13 +303,13 @@ endfunction()
# DEFINITIONS : definitions
#
# Example:
# px4_add_flags(
# px4_os_add_flags(
# C_FLAGS CMAKE_C_FLAGS
# CXX_FLAGS CMAKE_CXX_FLAGS
# EXE_LINKER_FLAG CMAKE_EXE_LINKER_FLAGS
# INCLUDES <list>)
#
function(px4_add_flags)
function(px4_os_add_flags)
set(inout_vars
C_FLAGS CXX_FLAGS EXE_LINKER_FLAGS INCLUDE_DIRS LINK_DIRS DEFINITIONS)
@@ -369,14 +369,14 @@ function(px4_add_flags)
foreach(var ${inout_vars})
string(TOLOWER ${var} lower_var)
set(${${var}} ${${${var}}} ${added_${lower_var}} PARENT_SCOPE)
message(STATUS "nuttx: set(${${var}} ${${${var}}} ${added_${lower_var}} PARENT_SCOPE)")
#message(STATUS "nuttx: set(${${var}} ${${${var}}} ${added_${lower_var}} PARENT_SCOPE)")
endforeach()
endfunction()
#=============================================================================
#
# px4_prebuild_targets
# px4_os_prebuild_targets
#
# This function generates os dependent targets
@@ -396,9 +396,9 @@ endfunction()
# Example:
# px4_os_prebuild_targets(OUT target_list BOARD px4fmu-v2)
#
function(px4_prebuild_targets)
function(px4_os_prebuild_targets)
px4_parse_function_args(
NAME px4_add_os_libraries
NAME px4_os_prebuild_targets
ONE_VALUE OUT BOARD THREADS
REQUIRED OUT BOARD
ARGN ${ARGN})
cmake/px4_utils.cmake
+1 -1
View File
@@ -605,7 +605,7 @@ function(px4_add_common_flags)
foreach(var ${inout_vars})
string(TOLOWER ${var} lower_var)
set(${${var}} ${${${var}}} ${added_${lower_var}} PARENT_SCOPE)
message(STATUS "set(${${var}} ${${${var}}} ${added_${lower_var}} PARENT_SCOPE)")
#message(STATUS "set(${${var}} ${${${var}}} ${added_${lower_var}} PARENT_SCOPE)")
endforeach()
endfunction()