Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 10:46:33 +08:00
Code Issues Actions 31 Packages Projects Releases Wiki Activity

cmake: px4_add_module improve unity build dependencies to avoid unnecessary work

Browse Source
This commit is contained in:
Daniel Agar
2021-11-18 19:34:19 -05:00
parent 4c6621f6cf
commit 24090b724c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/px4_add_module.cmake
+2 -1
View File
@@ -107,7 +107,7 @@ function(px4_add_module)
# unity build # unity build
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MODULE}_unity.cpp add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MODULE}_unity.cpp
COMMAND cat ${SRCS} > ${CMAKE_CURRENT_BINARY_DIR}/${MODULE}_unity.cpp COMMAND cat ${SRCS} > ${CMAKE_CURRENT_BINARY_DIR}/${MODULE}_unity.cpp
DEPENDS ${MODULE}_original ${DEPENDS} ${SRCS} DEPENDS ${SRCS}
COMMENT "${MODULE} merging source" COMMENT "${MODULE} merging source"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )
@@ -115,6 +115,7 @@ function(px4_add_module)
add_library(${MODULE} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${MODULE}_unity.cpp) add_library(${MODULE} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${MODULE}_unity.cpp)
target_include_directories(${MODULE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(${MODULE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
add_dependencies(${MODULE} ${MODULE}_original) # build standalone module first to get clean compile errors
if(COMPILE_FLAGS) if(COMPILE_FLAGS)
target_compile_options(${MODULE}_original PRIVATE ${COMPILE_FLAGS}) target_compile_options(${MODULE}_original PRIVATE ${COMPILE_FLAGS})