mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-16 06:13:34 +08:00
Cygwin: use relative paths where needed
This commit is contained in:
@@ -43,8 +43,6 @@ px4_add_module(
|
||||
platforms__common
|
||||
)
|
||||
|
||||
include(cygwin_cygpath)
|
||||
|
||||
# include the px4io binary in ROMFS
|
||||
message(STATUS "Building and including ${config_io_board}")
|
||||
|
||||
@@ -63,14 +61,12 @@ add_custom_command(OUTPUT ${fw_io_exe}
|
||||
USES_TERMINAL
|
||||
)
|
||||
|
||||
# only in the cygwin environment: convert paths for
|
||||
# binary in and output to mixed windows paths (C:/...)
|
||||
CYGPATH(fw_io_exe fw_io_exe_cyg)
|
||||
CYGPATH(fw_io_bin fw_io_bin_cyg)
|
||||
file(RELATIVE_PATH fw_io_exe_relative ${CMAKE_CURRENT_BINARY_DIR} ${fw_io_exe})
|
||||
file(RELATIVE_PATH fw_io_bin_relative ${CMAKE_CURRENT_BINARY_DIR} ${fw_io_bin})
|
||||
|
||||
add_custom_command(OUTPUT ${fw_io_bin}
|
||||
COMMAND mkdir -p ${PX4_BINARY_DIR}/ROMFS/${config_romfs_root}/extras/
|
||||
COMMAND ${OBJCOPY} -O binary ${fw_io_exe_cyg} ${fw_io_bin_cyg}
|
||||
COMMAND ${OBJCOPY} -O binary ${fw_io_exe_relative} ${fw_io_bin_relative}
|
||||
DEPENDS ${fw_io_exe}
|
||||
COMMENT "Copying ${config_io_board} to ROMFS extras"
|
||||
)
|
||||
|
||||
@@ -54,7 +54,6 @@
|
||||
#include <asm/socket.h>
|
||||
#endif
|
||||
|
||||
|
||||
MavlinkShell::MavlinkShell()
|
||||
{
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user