Skip to content

Commit

Permalink
first commit
Browse files Browse the repository at this point in the history
  • Loading branch information
BZUAV0 committed Jan 8, 2024
1 parent 0e2eec5 commit 0e129d3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ cmake_minimum_required(VERSION 3.9 FATAL_ERROR)

set(PX4_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE FILEPATH "PX4 source directory" FORCE)
set(PX4_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE FILEPATH "PX4 binary directory" FORCE)
set(PX4_PLATFORM "nuttx")

list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/cmake)
include(px4_parse_function_args)
Expand All @@ -120,6 +121,7 @@ execute_process(
)

# git describe to X.Y.Z version
message(STATUS "PX4 git tag: ${PX4_GIT_TAG}")
string(REPLACE "." ";" VERSION_LIST ${PX4_GIT_TAG})

# major version
Expand Down Expand Up @@ -179,6 +181,8 @@ if(PYTHON_COVERAGE)
set(PYTHON_EXECUTABLE coverage run -p)
endif()

include(platforms/${PX4_PLATFORM}/cmake/px4_impl_os.cmake)
list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/cmake)
include(px4_config)
include(kconfig)
message(STATUS "PX4 config: ${PX4_CONFIG}")
Expand Down Expand Up @@ -209,9 +213,6 @@ endif()

set_property(GLOBAL PROPERTY PX4_MODULE_CONFIG_FILES)

include(platforms/${PX4_PLATFORM}/cmake/px4_impl_os.cmake)
list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/cmake)

if(EXISTS "${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/cmake/init.cmake")
include(init)
endif()
Expand Down
4 changes: 2 additions & 2 deletions cmake/kconfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,8 @@ if(EXISTS ${BOARD_DEFCONFIG})
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type" FORCE)
endif()

include(px4_impl_os)
px4_os_prebuild_targets(OUT prebuild_targets BOARD ${PX4_BOARD})
# include(px4_impl_os)
# px4_os_prebuild_targets(OUT prebuild_targets BOARD ${PX4_BOARD})

# add board config directory src to build modules
file(RELATIVE_PATH board_support_src_rel ${PX4_SOURCE_DIR}/src ${PX4_BOARD_DIR})
Expand Down

0 comments on commit 0e129d3

Please sign in to comment.