espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 12:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_error_on_windows' into 'master'

Browse Source 
cmake: remove cmake ver specification for early exp script

See merge request espressif/esp-idf!9288
This commit is contained in:
Angus Gratton
2020-07-10 12:58:48 +08:00
parent 9e37bba82a 565dc4ba4b
commit f5b1f43a2b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/cmake/project.cmake
View File

@@ -10,6 +10,7 @@ set(IDFTOOL ${PYTHON} "${IDF_PATH}/tools/idf.py")
# Internally, the Python interpreter is already set to 'python'. Re-set here # Internally, the Python interpreter is already set to 'python'. Re-set here
# to be absolutely sure. # to be absolutely sure.
set_default(PYTHON "python") set_default(PYTHON "python")
file(TO_CMAKE_PATH ${PYTHON} PYTHON)
idf_build_set_property(PYTHON ${PYTHON}) idf_build_set_property(PYTHON ${PYTHON})
# On processing, checking Python required modules can be turned off if it was # On processing, checking Python required modules can be turned off if it was

3
tools/cmake/scripts/component_get_requirements.cmake
View File

@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.5) # if(IN_LIST) is used, which requires CMP0057 set to NEW
cmake_policy(SET CMP0057 NEW)
include("${BUILD_PROPERTIES_FILE}") include("${BUILD_PROPERTIES_FILE}")
include("${COMPONENT_PROPERTIES_FILE}") include("${COMPONENT_PROPERTIES_FILE}")