Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-13 19:40:27 +03:00
Code Issues Wiki Activity

Fix build bug

Browse source
This commit is contained in:
Scavanger 2023-01-24 11:36:09 -03:00
parent 3f750f28bb
commit aeada84a73
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake/settings.cmake
View file

@ -37,7 +37,7 @@ function(enable_settings exe name)
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} ${USE_HOST_GCC} -o "${dir}" ${RUBY_EXECUTABLE} ${SETTINGS_GENERATOR} ${MAIN_DIR} ${SETTINGS_FILE} -o "${dir}" ${USE_HOST_GCC}
DEPENDS ${SETTINGS_GENERATOR} ${SETTINGS_FILE} DEPENDS ${SETTINGS_GENERATOR} ${SETTINGS_FILE}
) )
set(${args_OUTPUTS} ${output} PARENT_SCOPE) set(${args_OUTPUTS} ${output} PARENT_SCOPE)

6
src/utils/settings.rb Executable file → Normal file
View file

@ -1148,8 +1148,8 @@ if __FILE__ == $0
opts = GetoptLong.new( opts = GetoptLong.new(
[ "--output-dir", "-o", GetoptLong::REQUIRED_ARGUMENT ], [ "--output-dir", "-o", GetoptLong::REQUIRED_ARGUMENT ],
[ "--help", "-h", GetoptLong::NO_ARGUMENT ], [ "--help", "-h", GetoptLong::NO_ARGUMENT ],
[ "--use_host_gcc", "-g", GetoptLong::REQUIRED_ARGUMENT],
[ "--json", "-j", GetoptLong::REQUIRED_ARGUMENT ], [ "--json", "-j", GetoptLong::REQUIRED_ARGUMENT ],
[ "--use_host_gcc", "-g", GetoptLong::NO_ARGUMENT ]
) )
jsonFile = nil jsonFile = nil
@ -1163,10 +1163,10 @@ if __FILE__ == $0
when "--help" when "--help"
usage() usage()
exit(0) exit(0)
when "--use_host_gcc"
use_host_gcc = true
when "--json" when "--json"
jsonFile = arg jsonFile = arg
when "--use_host_gcc"
use_host_gcc = true
end end
end end