blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 09:39:10 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_fix_fpga_build' into 'master'

Browse Source 
[cmake]: fixed FPGA setting during early build

See merge request espressif/esp-idf!14867
This commit is contained in:
Jakob Hasse 2021-08-26 10:41:51 +00:00
commit aee6c09c56
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/cmake/idf.cmake
View File

@ -49,5 +49,12 @@ if(NOT __idf_env_set)
__build_init("${idf_path}") __build_init("${idf_path}")
# Check if IDF_ENV_FPGA environment is set
set(env_idf_env_fpga $ENV{IDF_ENV_FPGA})
if(${env_idf_env_fpga})
idf_build_set_property(__IDF_ENV_FPGA "y")
message(NOTICE "IDF_ENV_FPGA is set, building for FPGA environment")
endif()
set_property(GLOBAL PROPERTY __IDF_ENV_SET 1) set_property(GLOBAL PROPERTY __IDF_ENV_SET 1)
endif() endif()

7
tools/cmake/targets.cmake
View File

@ -27,13 +27,6 @@ macro(__target_init)
# Finally, set IDF_TARGET in cache # Finally, set IDF_TARGET in cache
set(IDF_TARGET ${env_idf_target} CACHE STRING "IDF Build Target") set(IDF_TARGET ${env_idf_target} CACHE STRING "IDF Build Target")
# Check if IDF_ENV_FPGA environment is set
set(env_idf_env_fpga $ENV{IDF_ENV_FPGA})
if(${env_idf_env_fpga})
idf_build_set_property(__IDF_ENV_FPGA "y")
message(NOTICE "IDF_ENV_FPGA is set, building for FPGA environment")
endif()
endmacro() endmacro()
# #