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

cmake git submodules handle all paths consistently

Browse Source 
- relative to the PX4 source directory root
This commit is contained in:
Daniel Agar
2018-09-23 13:41:59 -04:00
parent 610ec9f854
commit 036734eb76
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/common/px4_git.cmake
+15 -6
View File
@@ -68,19 +68,28 @@ function(px4_add_git_submodule)
REQUIRED TARGET PATH REQUIRED TARGET PATH
ARGN ${ARGN}) ARGN ${ARGN})
execute_process(COMMAND ${PX4_SOURCE_DIR}/Tools/check_submodules.sh ${PATH} set(REL_PATH)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) if(IS_ABSOLUTE ${PATH})
file(RELATIVE_PATH REL_PATH ${PX4_SOURCE_DIR} ${PATH})
else()
file(RELATIVE_PATH REL_PATH ${PX4_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${PATH})
endif()
execute_process(
COMMAND Tools/check_submodules.sh ${REL_PATH}
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
)
string(REPLACE "/" "_" NAME ${PATH}) string(REPLACE "/" "_" NAME ${PATH})
string(REPLACE "." "_" NAME ${NAME}) string(REPLACE "." "_" NAME ${NAME})
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/git_init_${NAME}.stamp add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/git_init_${NAME}.stamp
COMMAND bash ${PX4_SOURCE_DIR}/Tools/check_submodules.sh ${PATH} COMMAND Tools/check_submodules.sh ${REL_PATH}
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/git_init_${NAME}.stamp COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/git_init_${NAME}.stamp
DEPENDS ${PX4_SOURCE_DIR}/.gitmodules ${PATH}/.git DEPENDS ${PX4_SOURCE_DIR}/.gitmodules ${PATH}/.git
COMMENT "git submodule ${PATH}" COMMENT "git submodule ${REL_PATH}"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${PX4_SOURCE_DIR}
USES_TERMINAL USES_TERMINAL
) )