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

Merge pull request #43 from mcharleb/cmake-mc

Browse Source 
cmake: fixed posix configs
This commit is contained in:
James Goppert
2015-09-10 23:04:00 -04:00
parent 3104a974a9 98897960e1
commit 97cb25254d
13 changed files with 91 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
CMakeLists.txt
View File

@@ -112,16 +112,16 @@ set(package-contact "px4users@googlegroups.com")
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
#=============================================================================
# cmake modules
# Validate build configuration and build
#
if (NOT NESTED_CMAKE_CALL)
message(STATUS "IN TOP")
if (EXISTS ${CMAKE_SOURCE_DIR}/cmake/configs/config_${CONFIG}.cmake)
if (EXISTS ${CMAKE_SOURCE_DIR}/cmake/configs/${CONFIG}.cmake)
# Get the toolchain information
include(configs/config_${CONFIG})
include(configs/${CONFIG})
else()
message(FATAL_ERROR "build config not found: config_${CONFIG}.cmake")
message(FATAL_ERROR "build config not found: ${CONFIG}.cmake")
endif()
if (NOT "${USE_TOOLCHAIN}" STREQUAL "")
set(TOOLCHAIN -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/toolchains/${USE_TOOLCHAIN}.cmake)
@@ -130,15 +130,6 @@ if (NOT NESTED_CMAKE_CALL)
list(GET TARGET_PARAMS 0 OS)
list(GET TARGET_PARAMS 1 BOARD)
list(GET TARGET_PARAMS 2 LABEL)
message(STATUS "CONFIG ${OS} ${BOARD} ${LABEL}")
if ("${LABEL}" STREQUAL "upload")
set(LABEL "simple")
set(DOUPLOAD "1")
endif()
if ("${LABEL}" STREQUAL "test")
set(LABEL "simple")
set(DOTEST "1")
endif()
execute_process( COMMAND ${CMAKE_COMMAND} -E make_directory ${CONFIG} )
set(NESTED_CMAKE_CALL 1)
message(STATUS "Before")
@@ -149,14 +140,6 @@ if (NOT NESTED_CMAKE_CALL)
COMMAND make -s
)
message(STATUS "${CMAKE_COMMAND} VERBOSE=1 ${CMAKE_SOURCE_DIR} ${TOOLCHAIN} -DOS=${OS} -DBOARD=${BOARD} -DLABEL=${LABEL}")
if ("${DOUPLOAD}" STREQUAL "1")
execute_process( WORKING_DIRECTORY ${CONFIG}
COMMAND make upload)
endif()
if ("${DOTEST}" STREQUAL "1")
execute_process( WORKING_DIRECTORY ${CONFIG}
COMMAND make test)
endif()
return()
endif(NOT NESTED_CMAKE_CALL)