Skip to content

Commit ae1370b

Browse files
authored
ESP32: Add a comment in all-clusters-app Makefile and CMakeLists.txt (project-chip#5254)
We now support CMake in addition to automake. Add a comment so that either of the builds do not break.
1 parent c06b3f5 commit ae1370b

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed

examples/all-clusters-app/esp32/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
cmake_minimum_required(VERSION 3.5)
2525
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
2626

27+
# The list of extra component dirs must be in sync with that in all-clusters-app/esp32/Makefile
2728
set(EXTRA_COMPONENT_DIRS
2829
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
2930
"${CMAKE_CURRENT_LIST_DIR}/../../common/m5stack-tft/repo/components"

examples/all-clusters-app/esp32/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
PROJECT_NAME := chip-all-clusters-app
2323

24+
# The list of extra component dirs must be in sync with that in all-clusters-app/esp32/CMakeLists.txt
2425
EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/third_party/connectedhomeip/config/esp32/components \
2526
$(PROJECT_PATH)/../../common/m5stack-tft/repo/components \
2627
$(PROJECT_PATH)/../../common/QRCode \

examples/all-clusters-app/esp32/main/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# Component makefile for the ESP32 demo application.
1919
#
2020
# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
21+
# The list of src and include dirs must be in sync with that in all-clusters-app/esp32/main/component.mk
2122
idf_component_register(PRIV_INCLUDE_DIRS
2223
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util"
2324
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app"
@@ -35,8 +36,11 @@ idf_component_register(PRIV_INCLUDE_DIRS
3536
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/level-control"
3637
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/identify"
3738
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/barrier-control-server"
39+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-commissioning-server"
3840
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/groups-server"
3941
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/color-control-server"
42+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/content-launch-server"
43+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/media-playback-server"
4044
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/temperature-measurement-server"
4145
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/scenes"
4246
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/basic"
@@ -48,4 +52,4 @@ idf_component_register(PRIV_INCLUDE_DIRS
4852
PRIV_REQUIRES chip QRCode tft spidriver bt screen-framework)
4953

5054
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14)
51-
target_compile_options(${COMPONENT_LIB} PRIVATE "-DLWIP_IPV6_SCOPES=0" "-DCHIP_HAVE_CONFIG_H")
55+
target_compile_options(${COMPONENT_LIB} PRIVATE "-DLWIP_IPV6_SCOPES=0" "-DCHIP_HAVE_CONFIG_H")

examples/all-clusters-app/esp32/main/component.mk

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
COMPONENT_DEPENDS := chip QRCode tft spidriver
2323

24+
# The list of src and include dirs must be in sync with that in all-clusters-app/esp32/main/CMakeLists.txt
2425
COMPONENT_SRCDIRS := \
2526
. \
2627
../third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/gen \

0 commit comments

Comments
 (0)