Prechádzať zdrojové kódy

Fix cmake confserver target

Roland Dobai 6 rokov pred
rodič
commit
a52451258e

+ 3 - 0
tools/ci/test_build_system_cmake.sh

@@ -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"

+ 2 - 2
tools/cmake/kconfig.cmake

@@ -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()