Merge branch 'fix/esp_hw_support_remove_unused_include_dirs_v5.2' int…

…o 'release/v5.2' fix(esp_hw_support): Removed nonexistent include directories from cmake (v5.2) See merge request espressif/esp-idf!27606
espressif · Dec 6, 2023 · 56a6cad · 56a6cad
2 parents e2b18f2 + e3653aa
commit 56a6cad
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 11 deletions.
diff --git a/components/esp_hw_support/port/esp32/CMakeLists.txt b/components/esp_hw_support/port/esp32/CMakeLists.txt
@@ -1,5 +1,4 @@
 target_include_directories(${COMPONENT_LIB} PUBLIC .)
-target_include_directories(${COMPONENT_LIB} PUBLIC private_include)
 
 set(srcs
     "rtc_clk.c"

diff --git a/components/esp_hw_support/port/esp32c2/CMakeLists.txt b/components/esp_hw_support/port/esp32c2/CMakeLists.txt
@@ -15,5 +15,3 @@ endif()
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
 
 target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
-target_include_directories(${COMPONENT_LIB} PUBLIC . private_include)
-target_include_directories(${COMPONENT_LIB} PRIVATE ../hal)
diff --git a/components/esp_hw_support/port/esp32c3/CMakeLists.txt b/components/esp_hw_support/port/esp32c3/CMakeLists.txt
@@ -22,5 +22,3 @@ endif()
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
 
 target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
-target_include_directories(${COMPONENT_LIB} PUBLIC . private_include)
-target_include_directories(${COMPONENT_LIB} PRIVATE ../hal)
diff --git a/components/esp_hw_support/port/esp32c6/CMakeLists.txt b/components/esp_hw_support/port/esp32c6/CMakeLists.txt
@@ -22,4 +22,3 @@ add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
 
 target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
 target_include_directories(${COMPONENT_LIB} PUBLIC . private_include)
-target_include_directories(${COMPONENT_LIB} PRIVATE ../hal)
diff --git a/components/esp_hw_support/port/esp32h2/CMakeLists.txt b/components/esp_hw_support/port/esp32h2/CMakeLists.txt
@@ -16,4 +16,3 @@ add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
 
 target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
 target_include_directories(${COMPONENT_LIB} PUBLIC . private_include)
-target_include_directories(${COMPONENT_LIB} PRIVATE ../hal)
diff --git a/components/esp_hw_support/port/esp32p4/CMakeLists.txt b/components/esp_hw_support/port/esp32p4/CMakeLists.txt
@@ -25,5 +25,3 @@ list(REMOVE_ITEM srcs
 add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")
 
 target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
-target_include_directories(${COMPONENT_LIB} PUBLIC . private_include)
-target_include_directories(${COMPONENT_LIB} PRIVATE ../hal)
diff --git a/components/esp_hw_support/port/esp32s2/CMakeLists.txt b/components/esp_hw_support/port/esp32s2/CMakeLists.txt
@@ -1,5 +1,4 @@
 target_include_directories(${COMPONENT_LIB} PUBLIC .)
-target_include_directories(${COMPONENT_LIB} PUBLIC private_include)
 
 set(srcs
     "rtc_clk.c"

diff --git a/components/esp_hw_support/port/esp32s3/CMakeLists.txt b/components/esp_hw_support/port/esp32s3/CMakeLists.txt
@@ -1,5 +1,4 @@
 target_include_directories(${COMPONENT_LIB} PUBLIC .)
-target_include_directories(${COMPONENT_LIB} PUBLIC private_include)
 
 set(srcs
     "rtc_clk.c"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,3 @@ add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")

		target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
		target_include_directories(${COMPONENT_LIB} PUBLIC . private_include)
		target_include_directories(${COMPONENT_LIB} PRIVATE ../hal)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,3 @@ add_prefix(srcs "${CMAKE_CURRENT_LIST_DIR}/" "${srcs}")

		target_sources(${COMPONENT_LIB} PRIVATE "${srcs}")
		target_include_directories(${COMPONENT_LIB} PUBLIC . private_include)
		target_include_directories(${COMPONENT_LIB} PRIVATE ../hal)