yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Naming fix.

Browse Source
This commit is contained in:
James Goppert
2015-09-08 00:07:41 -04:00
parent 29520c0834
commit 852c72fdc7
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -112,7 +112,6 @@ set(package-contact "px4users@googlegroups.com")
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
include(px4_${OS}_utils) include(px4_${OS}_utils)
set(px4_required_functions set(px4_required_functions
px4_os_add_firmware
px4_os_prebuild_targets px4_os_prebuild_targets
px4_os_add_flags px4_os_add_flags
) )

16
cmake/px4_nuttx_utils.cmake
View File

@@ -278,12 +278,12 @@ endfunction()
#============================================================================= #=============================================================================
# #
# px4_add_flags # px4_os_add_flags
# #
# Set ths nuttx build flags. # Set ths nuttx build flags.
# #
# Usage: # Usage:
# px4_add_flags( # px4_os_add_flags(
# C_FLAGS <inout-variable> # C_FLAGS <inout-variable>
# CXX_FLAGS <inout-variable> # CXX_FLAGS <inout-variable>
# EXE_LINKER_FLAGS <inout-variable> # EXE_LINKER_FLAGS <inout-variable>
@@ -303,13 +303,13 @@ endfunction()
# DEFINITIONS : definitions # DEFINITIONS : definitions
# #
# Example: # Example:
# px4_add_flags( # px4_os_add_flags(
# C_FLAGS CMAKE_C_FLAGS # C_FLAGS CMAKE_C_FLAGS
# CXX_FLAGS CMAKE_CXX_FLAGS # CXX_FLAGS CMAKE_CXX_FLAGS
# EXE_LINKER_FLAG CMAKE_EXE_LINKER_FLAGS # EXE_LINKER_FLAG CMAKE_EXE_LINKER_FLAGS
# INCLUDES <list>) # INCLUDES <list>)
# #
function(px4_add_flags) function(px4_os_add_flags)
set(inout_vars set(inout_vars
C_FLAGS CXX_FLAGS EXE_LINKER_FLAGS INCLUDE_DIRS LINK_DIRS DEFINITIONS) C_FLAGS CXX_FLAGS EXE_LINKER_FLAGS INCLUDE_DIRS LINK_DIRS DEFINITIONS)
@@ -369,14 +369,14 @@ function(px4_add_flags)
foreach(var ${inout_vars}) foreach(var ${inout_vars})
string(TOLOWER ${var} lower_var) string(TOLOWER ${var} lower_var)
set(${${var}} ${${${var}}} ${added_${lower_var}} PARENT_SCOPE) 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() endforeach()
endfunction() endfunction()
#============================================================================= #=============================================================================
# #
# px4_prebuild_targets # px4_os_prebuild_targets
# #
# This function generates os dependent targets # This function generates os dependent targets
@@ -396,9 +396,9 @@ endfunction()
# Example: # Example:
# px4_os_prebuild_targets(OUT target_list BOARD px4fmu-v2) # px4_os_prebuild_targets(OUT target_list BOARD px4fmu-v2)
# #
function(px4_prebuild_targets) function(px4_os_prebuild_targets)
px4_parse_function_args( px4_parse_function_args(
NAME px4_add_os_libraries NAME px4_os_prebuild_targets
ONE_VALUE OUT BOARD THREADS ONE_VALUE OUT BOARD THREADS
REQUIRED OUT BOARD REQUIRED OUT BOARD
ARGN ${ARGN}) ARGN ${ARGN})

2
cmake/px4_utils.cmake
View File

@@ -605,7 +605,7 @@ function(px4_add_common_flags)
foreach(var ${inout_vars}) foreach(var ${inout_vars})
string(TOLOWER ${var} lower_var) string(TOLOWER ${var} lower_var)
set(${${var}} ${${${var}}} ${added_${lower_var}} PARENT_SCOPE) 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() endforeach()
endfunction() endfunction()

2
src/CMakeLists.txt
View File

@@ -64,7 +64,7 @@ if (${OS} STREQUAL "nuttx")
px4_nuttx_add_firmware(OUT fw_main.px4 EXE main) px4_nuttx_add_firmware(OUT fw_main.px4 EXE main)
px4_add_upload(OUT upload OS ${OS} BOARD ${BOARD} BUNDLE fw_main.px4) px4_add_upload(OUT upload OS ${OS} BOARD ${BOARD} BUNDLE fw_main.px4)
px4_generate_romfs(OUT romfs.img ROOT ROMFS/px4fmu_common) px4_nuttx_generate_romfs(OUT romfs.img ROOT ROMFS/px4fmu_common)
endif() endif()