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

Fix cmake confserver target

Browse source
This commit is contained in:
Roland Dobai 2019-05-22 10:04:25 +02:00
parent c879aff6f5
commit a52451258e
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/ci/test_build_system_cmake.sh
View file

@ -404,6 +404,9 @@ endmenu\n" >> ${IDF_PATH}/Kconfig;
git checkout -- sdkconfig.rename Kconfig
popd
print_status "Confserver can be invoked by idf.py"
echo '{"version": 1}' | idf.py confserver || failure "Couldn't load confserver"
print_status "Check ccache is used to build when present"
touch ccache && chmod +x ccache # make sure that ccache is present for this test
(export PATH=$PWD:$PATH && idf.py reconfigure | grep "ccache will be used for faster builds") || failure "ccache should be used when present"

4
tools/cmake/kconfig.cmake
View file

@ -212,8 +212,8 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
add_custom_target(confserver
COMMAND ${CMAKE_COMMAND} -E env
"COMPONENT_KCONFIGS=${kconfigs}"
"COMPONENT_KCONFIGS_PROJBUILD=${kconfigs_projbuild}"
${PYTHON} ${IDF_PATH}/tools/kconfig_new/confserver.py --kconfig ${IDF_PATH}/Kconfig --config ${SDKCONFIG}
"COMPONENT_KCONFIGS_PROJBUILD=${kconfig_projbuilds}"
${PYTHON} ${IDF_PATH}/tools/kconfig_new/confserver.py --kconfig ${IDF_PATH}/Kconfig --config ${sdkconfig}
VERBATIM
USES_TERMINAL)
endfunction()