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/fix_build_error_in_protocol_examples_v5.1' into 'release/v5.1'

Browse Source 
fix: Fix protocols example to build without setting target (v5.1)

See merge request espressif/esp-idf!26200
This commit is contained in:
Mahavir Jain
2023-09-26 16:11:38 +08:00
parent aaded3fd59 7decf3e344
commit e565bc5a1b
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/protocols/esp_http_client/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16)
set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common)
if(${IDF_TARGET} STREQUAL "linux")
if("${IDF_TARGET}" STREQUAL "linux")
list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/mocks/freertos/"
"$ENV{IDF_PATH}/examples/protocols/linux_stubs/esp_stubs")
set(COMPONENTS main)

4
examples/protocols/esp_http_client/main/CMakeLists.txt
View File

@@ -2,7 +2,9 @@
#
# (If this was a component, we would set COMPONENT_EMBED_TXTFILES here.)
set(requires "")
if(${IDF_TARGET} STREQUAL "linux")
idf_build_get_property(target IDF_TARGET)
if(${target} STREQUAL "linux")
list(APPEND requires esp_stubs esp-tls esp_http_client protocol_examples_common nvs_flash)
endif()
idf_component_register(SRCS "esp_http_client_example.c"

2
examples/protocols/http_server/simple/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16)
set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common)
if(${IDF_TARGET} STREQUAL "linux")
if("${IDF_TARGET}" STREQUAL "linux")
list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/mocks/freertos/"
"$ENV{IDF_PATH}/examples/protocols/linux_stubs/esp_stubs")
set(COMPONENTS main)

4
examples/protocols/http_server/simple/main/CMakeLists.txt
View File

@@ -1,5 +1,7 @@
set(requires "")
if(${IDF_TARGET} STREQUAL "linux")
idf_build_get_property(target IDF_TARGET)
if(${target} STREQUAL "linux")
list(APPEND requires esp_stubs esp-tls esp_http_server protocol_examples_common nvs_flash)
endif()
idf_component_register(SRCS "main.c"

4
examples/protocols/sockets/tcp_client/main/CMakeLists.txt
View File

@@ -1,4 +1,6 @@
if(${IDF_TARGET} STREQUAL "linux")
idf_build_get_property(target IDF_TARGET)
if(${target} STREQUAL "linux")
set(requires esp_stubs protocol_examples_common nvs_flash)
endif()