Merge branch 'refactor/protocomm_public_hdr_v5.1' into 'release/v5.1'

refactor(protocomm): Make the protocomm `proto-c` headers public (v5.1) See merge request espressif/esp-idf!29359
espressif · Mar 1, 2024 · d22c95a · d22c95a
2 parents 67c4eac + bda0a44
commit d22c95a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)