Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-26 01:35:35 +03:00
Code Issues Wiki Activity

Fix WSL build

Browse source
This commit is contained in:
Ilia Novoselov 2021-10-23 17:04:43 +05:00
parent 4086fb10a0
commit 1d7ba3a926
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake/settings.cmake
View file

@ -33,7 +33,7 @@ function(enable_settings exe name)
add_custom_command( add_custom_command(
OUTPUT ${output} OUTPUT ${output}
COMMAND COMMAND
${CMAKE_COMMAND} -E env CFLAGS="${cflags}" TARGET=${name} PATH=$ENV{PATH} SETTINGS_CXX=${args_SETTINGS_CXX} ${CMAKE_COMMAND} -E env CFLAGS="${cflags}" TARGET=${name} PATH="$ENV{PATH}" SETTINGS_CXX=${args_SETTINGS_CXX}
${RUBY_EXECUTABLE} ${SETTINGS_GENERATOR} ${MAIN_DIR} ${SETTINGS_FILE} -o "${dir}" ${RUBY_EXECUTABLE} ${SETTINGS_GENERATOR} ${MAIN_DIR} ${SETTINGS_FILE} -o "${dir}"
DEPENDS ${SETTINGS_GENERATOR} ${SETTINGS_FILE} DEPENDS ${SETTINGS_GENERATOR} ${SETTINGS_FILE}
) )

4
cmake/stm32.cmake
View file

@ -189,7 +189,7 @@ endfunction()
function(add_hex_target name exe hex) function(add_hex_target name exe hex)
add_custom_target(${name} ALL add_custom_target(${name} ALL
cmake -E env PATH=$ENV{PATH} cmake -E env PATH="$ENV{PATH}"
# TODO: Overriding the start address with --set-start 0x08000000 # TODO: Overriding the start address with --set-start 0x08000000
# seems to be required due to some incorrect assumptions about .hex # seems to be required due to some incorrect assumptions about .hex
# files in the configurator. Verify wether that's the case and fix # files in the configurator. Verify wether that's the case and fix
@ -201,7 +201,7 @@ endfunction()
function(add_bin_target name exe bin) function(add_bin_target name exe bin)
add_custom_target(${name} add_custom_target(${name}
cmake -E env PATH=$ENV{PATH} cmake -E env PATH="$ENV{PATH}"
${CMAKE_OBJCOPY} -Obinary $<TARGET_FILE:${exe}> ${bin} ${CMAKE_OBJCOPY} -Obinary $<TARGET_FILE:${exe}> ${bin}
BYPRODUCTS ${bin} BYPRODUCTS ${bin}
) )