From bda0a44eaf75887ad91f7fe180f0f233634b22d0 Mon Sep 17 00:00:00 2001 From: Laukik Hase Date: Wed, 28 Feb 2024 13:47:08 +0530 Subject: [PATCH] refactor(protocomm): Make the protocomm `proto-c` headers public --- components/esp_local_ctrl/CMakeLists.txt | 2 +- components/protocomm/CMakeLists.txt | 5 +++-- components/protocomm/test_apps/main/CMakeLists.txt | 1 - components/wifi_provisioning/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/esp_local_ctrl/CMakeLists.txt b/components/esp_local_ctrl/CMakeLists.txt index 9c8574eb2874..a77040e96b03 100644 --- a/components/esp_local_ctrl/CMakeLists.txt +++ b/components/esp_local_ctrl/CMakeLists.txt @@ -1,5 +1,5 @@ set(include_dirs include) -set(priv_include_dirs proto-c src ../protocomm/proto-c) +set(priv_include_dirs proto-c src) set(srcs "src/esp_local_ctrl.c" "src/esp_local_ctrl_handler.c" "proto-c/esp_local_ctrl.pb-c.c") diff --git a/components/protocomm/CMakeLists.txt b/components/protocomm/CMakeLists.txt index dd967fdbfd04..ca1c96f6dcdb 100644 --- a/components/protocomm/CMakeLists.txt +++ b/components/protocomm/CMakeLists.txt @@ -1,8 +1,9 @@ set(include_dirs include/common include/security include/transports - include/crypto/srp6a) -set(priv_include_dirs proto-c src/common) + include/crypto/srp6a + proto-c) +set(priv_include_dirs src/common) set(srcs "src/common/protocomm.c" "proto-c/constants.pb-c.c" diff --git a/components/protocomm/test_apps/main/CMakeLists.txt b/components/protocomm/test_apps/main/CMakeLists.txt index bf687e286ba4..74dc603fa6af 100644 --- a/components/protocomm/test_apps/main/CMakeLists.txt +++ b/components/protocomm/test_apps/main/CMakeLists.txt @@ -1,4 +1,3 @@ idf_component_register(SRC_DIRS "." PRIV_INCLUDE_DIRS "." - PRIV_INCLUDE_DIRS "../../proto-c/" PRIV_REQUIRES cmock mbedtls protocomm protobuf-c test_utils unity) diff --git a/components/wifi_provisioning/CMakeLists.txt b/components/wifi_provisioning/CMakeLists.txt index df306ad264d2..fd8b1cb0f810 100644 --- a/components/wifi_provisioning/CMakeLists.txt +++ b/components/wifi_provisioning/CMakeLists.txt @@ -22,6 +22,6 @@ endif() idf_component_register(SRCS "${srcs}" INCLUDE_DIRS include - PRIV_INCLUDE_DIRS src proto-c ../protocomm/proto-c + PRIV_INCLUDE_DIRS src proto-c REQUIRES lwip protocomm PRIV_REQUIRES protobuf-c bt json esp_timer esp_wifi)