From 84a534a4a0c05cbf88bc2351cbfdbc2307bd79c0 Mon Sep 17 00:00:00 2001 From: Renz Christian Bagaporo Date: Mon, 25 Mar 2019 10:41:28 +0800 Subject: [PATCH] cmake: Fix for Python files executed directly, not via PYTHON variable --- components/ulp/cmake/CMakeLists.txt | 2 +- tools/cmake/kconfig.cmake | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/ulp/cmake/CMakeLists.txt b/components/ulp/cmake/CMakeLists.txt index c18867e1f..61f2881ce 100644 --- a/components/ulp/cmake/CMakeLists.txt +++ b/components/ulp/cmake/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) include(${IDF_PATH}/tools/cmake/utilities.cmake) project(${ULP_APP_NAME} ASM C) -set(ULP_MAP_GEN ${IDF_PATH}/components/ulp/esp32ulp_mapgen.py) +set(ULP_MAP_GEN ${PYTHON} ${IDF_PATH}/components/ulp/esp32ulp_mapgen.py) set(ULP_LD_TEMPLATE ${IDF_PATH}/components/ulp/ld/esp32.ulp.ld) get_filename_component(sdkconfig_dir ${SDKCONFIG} DIRECTORY) diff --git a/tools/cmake/kconfig.cmake b/tools/cmake/kconfig.cmake index 42486a1b1..5a87b8c01 100644 --- a/tools/cmake/kconfig.cmake +++ b/tools/cmake/kconfig.cmake @@ -132,7 +132,8 @@ function(kconfig_process_config) COMMAND ${CMAKE_COMMAND} -E env "COMPONENT_KCONFIGS=${kconfigs}" "COMPONENT_KCONFIGS_PROJBUILD=${kconfigs_projbuild}" - ${IDF_PATH}/tools/kconfig_new/confserver.py --kconfig ${IDF_PATH}/Kconfig --config ${SDKCONFIG} + ${PYTHON} ${IDF_PATH}/tools/kconfig_new/confserver.py + --kconfig ${IDF_PATH}/Kconfig --config ${SDKCONFIG} VERBATIM USES_TERMINAL)