Skip to content

Commit 2049666

Browse files
shubhamdppull[bot]
shubhamdp
authored and
pull[bot]
committed
[ESP32] Use absolute paths in example's CMakeLists.txt files (#16843)
1 parent 6499d2c commit 2049666

File tree

18 files changed

+70
-72
lines changed

18 files changed

+70
-72
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
# CMakeLists in this exact order for cmake to work correctly
1919
cmake_minimum_required(VERSION 3.5)
2020
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
21-
include(${CMAKE_CURRENT_LIST_DIR}/../../common/cmake/idf_flashing.cmake)
21+
include(${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/cmake/idf_flashing.cmake)
2222

2323
set(EXTRA_COMPONENT_DIRS
2424
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
25-
"${CMAKE_CURRENT_LIST_DIR}/../../common/QRCode"
25+
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/QRCode"
2626
"${IDF_PATH}/examples/common_components/led_strip"
2727
)
2828
if(${IDF_TARGET} STREQUAL "esp32")
29-
list(APPEND EXTRA_COMPONENT_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../common/m5stack-tft/repo/components/tft"
30-
"${CMAKE_CURRENT_LIST_DIR}/../../common/m5stack-tft/repo/components/spidriver"
31-
"${CMAKE_CURRENT_LIST_DIR}/../../common/screen-framework")
29+
list(APPEND EXTRA_COMPONENT_DIRS "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/m5stack-tft/repo/components/tft"
30+
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/m5stack-tft/repo/components/spidriver"
31+
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/screen-framework")
3232
endif()
3333

3434
project(chip-all-clusters-app)

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,17 @@ set(SRC_DIRS_LIST
9090
if (CONFIG_ENABLE_PW_RPC)
9191
# Append additional directories for RPC build
9292
set(PRIV_INCLUDE_DIRS_LIST "${PRIV_INCLUDE_DIRS_LIST}"
93-
"${CMAKE_SOURCE_DIR}/../../platform/esp32/pw_sys_io/public"
94-
"${CMAKE_SOURCE_DIR}/../../common"
95-
"${CMAKE_SOURCE_DIR}/../../common/pigweed"
96-
"${CMAKE_SOURCE_DIR}/../../common/pigweed/esp32"
97-
"${CMAKE_SOURCE_DIR}/../../../src/lib/support"
93+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/pw_sys_io/public"
94+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common"
95+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
96+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
97+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/lib/support"
9898
"${IDF_PATH}/components/freertos/include/freertos"
9999
)
100100
set(SRC_DIRS_LIST "${SRC_DIRS_LIST}"
101-
"${CMAKE_SOURCE_DIR}/../../platform/esp32"
102-
"${CMAKE_SOURCE_DIR}/../../common/pigweed"
103-
"${CMAKE_SOURCE_DIR}/../../common/pigweed/esp32"
101+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
102+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
103+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
104104
)
105105
endif (CONFIG_ENABLE_PW_RPC)
106106

@@ -132,7 +132,7 @@ target_compile_options(${COMPONENT_LIB} PUBLIC
132132

133133
if (CONFIG_ENABLE_PW_RPC)
134134

135-
get_filename_component(CHIP_ROOT ../third_party/connectedhomeip REALPATH)
135+
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
136136

137137
set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
138138
include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)

‎examples/bridge-app/esp32/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
cmake_minimum_required(VERSION 3.5)
1818
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
19-
include(${CMAKE_CURRENT_LIST_DIR}/../../common/cmake/idf_flashing.cmake)
19+
include(${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/cmake/idf_flashing.cmake)
2020

2121
set(EXTRA_COMPONENT_DIRS
2222
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
23-
"${CMAKE_CURRENT_LIST_DIR}/../../common/QRCode"
23+
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/QRCode"
2424
)
2525

2626
# TODO: add CHIPProjectAppConfig.h to esp32

‎examples/common/cmake/idf_flashing.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ macro(flashing_script)
7070
add_custom_target(flashing_script
7171
ALL
7272
COMMAND ${python}
73-
"${project_path}/../../../scripts/flashing/gen_flashing_script.py" ${board_type}
73+
"${project_path}/third_party/connectedhomeip/scripts/flashing/gen_flashing_script.py" ${board_type}
7474
--output "${build_dir}/${flashing_script}"
7575
--port "$ENV{ESPPORT}"
7676
--baud 460800

‎examples/ipv6only-app/esp32/main/CMakeLists.txt

+9-10
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,21 @@
1717
idf_component_register(INCLUDE_DIRS
1818
"${CMAKE_CURRENT_LIST_DIR}"
1919
"${CMAKE_CURRENT_LIST_DIR}/../include"
20-
"${CMAKE_SOURCE_DIR}/../../platform/esp32/pw_sys_io/public"
21-
"${CMAKE_SOURCE_DIR}/../../platform/esp32"
22-
"${CMAKE_SOURCE_DIR}/../../common/pigweed"
23-
"${CMAKE_SOURCE_DIR}/../../common/pigweed/esp32"
24-
"${CMAKE_SOURCE_DIR}/../../../src/lib/support"
20+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/pw_sys_io/public"
21+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
22+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
23+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
24+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/lib/support"
2525
"${IDF_PATH}/components/freertos/include/freertos"
2626

2727
SRC_DIRS
2828
"${CMAKE_CURRENT_LIST_DIR}"
29-
"${CMAKE_SOURCE_DIR}/../../platform/esp32"
30-
"${CMAKE_SOURCE_DIR}/../../common/pigweed"
31-
"${CMAKE_SOURCE_DIR}/../../common/pigweed/esp32"
29+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
30+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
31+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
3232
PRIV_REQUIRES bt chip)
3333

34-
get_filename_component(CHIP_ROOT ../third_party/connectedhomeip REALPATH)
35-
get_filename_component(IPV6_EXAMPLE_ROOT ../.. REALPATH)
34+
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
3635
set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
3736
include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
3837
include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)

‎examples/lighting-app/esp32/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
# CMakeLists in this exact order for cmake to work correctly
1919
cmake_minimum_required(VERSION 3.5)
2020
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
21-
include(${CMAKE_CURRENT_LIST_DIR}/../../common/cmake/idf_flashing.cmake)
21+
include(${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/cmake/idf_flashing.cmake)
2222

2323
set(EXTRA_COMPONENT_DIRS
2424
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
25-
"${CMAKE_CURRENT_LIST_DIR}/../../common/QRCode"
25+
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/QRCode"
2626
"${IDF_PATH}/examples/common_components/led_strip"
2727
)
2828

‎examples/lock-app/esp32/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
# CMakeLists in this exact order for cmake to work correctly
1919
cmake_minimum_required(VERSION 3.5)
2020
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
21-
include(${CMAKE_CURRENT_LIST_DIR}/../../common/cmake/idf_flashing.cmake)
21+
include(${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/cmake/idf_flashing.cmake)
2222

2323
set(EXTRA_COMPONENT_DIRS
2424
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
25-
"${CMAKE_CURRENT_LIST_DIR}/../../common/QRCode"
25+
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/QRCode"
2626
)
2727

2828
project(chip-lock-app)

‎examples/lock-app/esp32/main/CMakeLists.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@
1919
if (CONFIG_ENABLE_PW_RPC)
2020
idf_component_register(INCLUDE_DIRS
2121
"${CMAKE_CURRENT_LIST_DIR}"
22-
"${CMAKE_SOURCE_DIR}/../../platform/esp32/pw_sys_io/public"
23-
"${CMAKE_SOURCE_DIR}/../../platform/esp32"
24-
"${CMAKE_SOURCE_DIR}/../../common"
25-
"${CMAKE_SOURCE_DIR}/../../common/pigweed"
26-
"${CMAKE_SOURCE_DIR}/../../common/pigweed/esp32"
22+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/pw_sys_io/public"
23+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
24+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common"
25+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
26+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
2727
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/lib/support"
2828
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/lock-app/"
2929
"${CMAKE_CURRENT_LIST_DIR}/include"
3030
"${IDF_PATH}/components/freertos/include/freertos"
3131
SRC_DIRS
3232
"${CMAKE_CURRENT_LIST_DIR}"
33-
"${CMAKE_SOURCE_DIR}/../../platform/esp32"
34-
"${CMAKE_SOURCE_DIR}/../../common/pigweed"
35-
"${CMAKE_SOURCE_DIR}/../../common/pigweed/esp32"
33+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
34+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
35+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
3636
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/app-common/app-common/zap-generated/attributes"
3737
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/app-common/app-common/zap-generated"
3838
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/lock-app/zap-generated"
@@ -62,7 +62,7 @@ idf_component_register(INCLUDE_DIRS
6262
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-server"
6363
PRIV_REQUIRES bt chip QRCode)
6464

65-
get_filename_component(CHIP_ROOT ../third_party/connectedhomeip REALPATH)
65+
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
6666

6767
set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
6868
include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)

‎examples/ota-provider-app/esp32/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
cmake_minimum_required(VERSION 3.5)
2020

2121
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
22-
include(${CMAKE_CURRENT_LIST_DIR}/../../common/cmake/idf_flashing.cmake)
22+
include(${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/cmake/idf_flashing.cmake)
2323

2424
set(EXTRA_COMPONENT_DIRS
2525
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
26-
"${CMAKE_CURRENT_LIST_DIR}/../../common/QRCode"
26+
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/QRCode"
2727
)
2828

2929
project(chip-ota-provider-app)

‎examples/ota-provider-app/esp32/main/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ idf_component_register(PRIV_INCLUDE_DIRS
5555
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/ota-provider-app/ota-provider-common/BdxOtaSender.cpp"
5656
PRIV_REQUIRES chip QRCode bt console spiffs)
5757

58-
spiffs_create_partition_image(img_storage ../spiffs_image FLASH_IN_PROJECT)
58+
spiffs_create_partition_image(img_storage ${CMAKE_SOURCE_DIR}/spiffs_image FLASH_IN_PROJECT)
5959
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14)
6060
target_compile_options(${COMPONENT_LIB} PRIVATE "-DLWIP_IPV6_SCOPES=0" "-DCHIP_HAVE_CONFIG_H")
6161
target_compile_options(${COMPONENT_LIB} PUBLIC

‎examples/ota-requestor-app/esp32/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
cmake_minimum_required(VERSION 3.5)
2020

2121
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
22-
include(${CMAKE_CURRENT_LIST_DIR}/../../common/cmake/idf_flashing.cmake)
22+
include(${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/cmake/idf_flashing.cmake)
2323

2424
set(EXTRA_COMPONENT_DIRS
2525
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
26-
"${CMAKE_CURRENT_LIST_DIR}/../../common/QRCode"
26+
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/QRCode"
2727
)
2828

2929
project(chip-ota-requestor-app)

‎examples/persistent-storage/esp32/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# CMakeLists in this exact order for cmake to work correctly
1818
cmake_minimum_required(VERSION 3.5)
1919
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
20-
include(${CMAKE_CURRENT_LIST_DIR}/../../common/cmake/idf_flashing.cmake)
20+
include(${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/cmake/idf_flashing.cmake)
2121

2222
set(EXTRA_COMPONENT_DIRS
2323
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"

‎examples/persistent-storage/esp32/main/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
idf_component_register(PRIV_INCLUDE_DIRS
1919
"${CMAKE_CURRENT_LIST_DIR}"
20-
"${CMAKE_SOURCE_DIR}/.."
20+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/persistent-storage"
2121
SRC_DIRS
2222
"${CMAKE_CURRENT_LIST_DIR}"
23-
"${CMAKE_SOURCE_DIR}/.."
23+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/persistent-storage"
2424
PRIV_REQUIRES chip nvs_flash)
2525

2626
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14)

‎examples/pigweed-app/esp32/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# CMakeLists in this exact order for cmake to work correctly
1919
cmake_minimum_required(VERSION 3.5)
2020
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
21-
include(${CMAKE_CURRENT_LIST_DIR}/../../common/cmake/idf_flashing.cmake)
21+
include(${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/cmake/idf_flashing.cmake)
2222

2323

2424
set(EXTRA_COMPONENT_DIRS
@@ -57,5 +57,4 @@ list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
5757
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
5858
set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
5959

60-
idf_build_get_property(project_path PROJECT_DIR)
61-
flashing_script(DEPENDS "${project_path}/echo_test_config.yml" "${project_path}/../mobly_tests/echo_test.py")
60+
flashing_script(DEPENDS "${CMAKE_CURRENT_LIST_DIR}/echo_test_config.yml" "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/pigweed-app/mobly_tests/echo_test.py")

‎examples/pigweed-app/esp32/main/CMakeLists.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616

1717
idf_component_register(INCLUDE_DIRS
1818
"${CMAKE_CURRENT_LIST_DIR}"
19-
"${CMAKE_SOURCE_DIR}/../../platform/esp32/pw_sys_io/public"
20-
"${CMAKE_SOURCE_DIR}/../../platform/esp32"
21-
"${CMAKE_SOURCE_DIR}/../../common/pigweed"
22-
"${CMAKE_SOURCE_DIR}/../../common/pigweed/esp32"
23-
"${CMAKE_SOURCE_DIR}/../../../src/lib/support"
19+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/pw_sys_io/public"
20+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
21+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
22+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
23+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/lib/support"
2424
"${IDF_PATH}/components/freertos/include/freertos"
2525

2626
SRC_DIRS
2727
"${CMAKE_CURRENT_LIST_DIR}"
28-
"${CMAKE_SOURCE_DIR}/../../platform/esp32"
29-
"${CMAKE_SOURCE_DIR}/../../common/pigweed"
30-
"${CMAKE_SOURCE_DIR}/../../common/pigweed/esp32"
28+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
29+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
30+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
3131
PRIV_REQUIRES bt chip)
3232

33-
get_filename_component(CHIP_ROOT ../third_party/connectedhomeip REALPATH)
33+
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
3434
set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
3535

3636
include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)

‎examples/shell/esp32/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# CMakeLists in this exact order for cmake to work correctly
1919
cmake_minimum_required(VERSION 3.5)
2020
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
21-
include(${CMAKE_CURRENT_LIST_DIR}/../../common/cmake/idf_flashing.cmake)
21+
include(${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/cmake/idf_flashing.cmake)
2222

2323
set(EXTRA_COMPONENT_DIRS
2424
${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components

‎examples/temperature-measurement-app/esp32/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ if(NOT is_debug)
2424
endif()
2525

2626
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
27-
include(${CMAKE_CURRENT_LIST_DIR}/../../common/cmake/idf_flashing.cmake)
27+
include(${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/cmake/idf_flashing.cmake)
2828

2929

3030
set(EXTRA_COMPONENT_DIRS
3131
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
32-
"${CMAKE_CURRENT_LIST_DIR}/../../common/QRCode"
32+
"${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/common/QRCode"
3333
)
3434

3535
project(chip-temperature-measurement-app)

‎examples/temperature-measurement-app/esp32/main/CMakeLists.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ set(PRIV_REQUIRES_LIST chip QRCode bt)
5757
if (CONFIG_ENABLE_PW_RPC)
5858
# Append additional directories for RPC build
5959
set(PRIV_INCLUDE_DIRS_LIST "${PRIV_INCLUDE_DIRS_LIST}"
60-
"${CMAKE_SOURCE_DIR}/../../platform/esp32/pw_sys_io/public"
61-
"${CMAKE_SOURCE_DIR}/../../common"
62-
"${CMAKE_SOURCE_DIR}/../../common/pigweed"
63-
"${CMAKE_SOURCE_DIR}/../../common/pigweed/esp32"
64-
"${CMAKE_SOURCE_DIR}/../../../src/lib/support"
60+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/pw_sys_io/public"
61+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common"
62+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
63+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
64+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/lib/support"
6565
"${IDF_PATH}/components/freertos/include/freertos"
6666
)
6767
set(SRC_DIRS_LIST "${SRC_DIRS_LIST}"
68-
"${CMAKE_SOURCE_DIR}/../../platform/esp32"
69-
"${CMAKE_SOURCE_DIR}/../../common/pigweed"
70-
"${CMAKE_SOURCE_DIR}/../../common/pigweed/esp32"
68+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
69+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed"
70+
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32"
7171
)
7272
endif (CONFIG_ENABLE_PW_RPC)
7373

@@ -83,7 +83,7 @@ target_compile_options(${COMPONENT_LIB} PUBLIC
8383

8484
if (CONFIG_ENABLE_PW_RPC)
8585

86-
get_filename_component(CHIP_ROOT ../third_party/connectedhomeip REALPATH)
86+
get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
8787

8888
set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
8989
include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)

0 commit comments

Comments
 (0)