Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_menuconfig' into 'master'

Browse source 
Tools: Fix CMake menuconfig used with combination of MSYS and CMD

Closes IDFGH-1248

See merge request idf/esp-idf!5089
This commit is contained in:
Angus Gratton 2019-06-04 07:06:40 +08:00
commit a83b4cfc1c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/cmake/kconfig.cmake
View file

@ -9,6 +9,7 @@ function(__kconfig_init)
else() else()
unset(WINPTY CACHE) # in case previous CMake run was in a tty and this one is not unset(WINPTY CACHE) # in case previous CMake run was in a tty and this one is not
endif() endif()
unset(MCONF CACHE) # needed when MSYS and CMD is intermixed (cache could contain an incompatible path)
find_program(MCONF mconf-idf) find_program(MCONF mconf-idf)
# Fall back to the old binary which was called 'mconf' not 'mconf-idf' # Fall back to the old binary which was called 'mconf' not 'mconf-idf'
@ -30,7 +31,7 @@ function(__kconfig_init)
"Consult the setup docs for ESP-IDF on Windows.") "Consult the setup docs for ESP-IDF on Windows.")
endif() endif()
elseif(WINPTY) elseif(WINPTY)
set(MCONF "${WINPTY}" "${MCONF}") set(MCONF "\"${WINPTY}\" \"${MCONF}\"")
endif() endif()
endif() endif()
@ -201,7 +202,8 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
"IDF_CMAKE=y" "IDF_CMAKE=y"
"KCONFIG_CONFIG=${sdkconfig}" "KCONFIG_CONFIG=${sdkconfig}"
${mconf} ${root_kconfig} ${mconf} ${root_kconfig}
VERBATIM # VERBATIM cannot be used here because it cannot handle ${mconf}="winpty mconf-idf" and the escaping must be
# done manually
USES_TERMINAL USES_TERMINAL
# additional run of confgen esures that the deprecated options will be inserted into sdkconfig (for backward # additional run of confgen esures that the deprecated options will be inserted into sdkconfig (for backward
# compatibility) # compatibility)