[clang-tools-extra] [clang-include-cleaner] Export public headers as part of the CMake target (PR #167110)

[Victor Chernyakin via cfe-commits]

https://github.com/localspook updated https://github.com/llvm/llvm-project/pull/167110

>From da8121ef15e6c93deb8a8f54fea6a8bb9a1b5bc2 Mon Sep 17 00:00:00 2001
From: Victor Chernyakin <chernyakin.victor.j at outlook.com>
Date: Sat, 8 Nov 2025 00:13:18 -0800
Subject: [PATCH] [clang-include-cleaner] Export public headers as part of the
 CMake target

---
 clang-tools-extra/clang-tidy/misc/CMakeLists.txt        | 2 --
 clang-tools-extra/clangd/CMakeLists.txt                 | 1 -
 clang-tools-extra/clangd/indexer/CMakeLists.txt         | 1 +
 clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt | 1 +
 clang-tools-extra/clangd/tool/CMakeLists.txt            | 1 +
 clang-tools-extra/include-cleaner/CMakeLists.txt        | 1 -
 clang-tools-extra/include-cleaner/lib/CMakeLists.txt    | 2 ++
 clang-tools-extra/unittests/clang-tidy/CMakeLists.txt   | 1 -
 8 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
index 2cfee5fd10713..26aebf845258b 100644
--- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
@@ -7,8 +7,6 @@ setup_host_tool(clang-tidy-confusable-chars-gen CLANG_TIDY_CONFUSABLE_CHARS_GEN
 
 add_subdirectory(ConfusableTable)
 
-include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../../include-cleaner/include")
-
 add_custom_command(
     OUTPUT Confusables.inc
     COMMAND ${clang_tidy_confusable_chars_gen} ${CMAKE_CURRENT_SOURCE_DIR}/ConfusableTable/confusables.txt ${CMAKE_CURRENT_BINARY_DIR}/Confusables.inc
diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt
index fb3f05329be21..ce816560da6d0 100644
--- a/clang-tools-extra/clangd/CMakeLists.txt
+++ b/clang-tools-extra/clangd/CMakeLists.txt
@@ -59,7 +59,6 @@ if(MSVC AND NOT CLANG_CL)
 endif()
 
 include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy")
-include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../include-cleaner/include")
 
 add_clang_library(clangDaemon STATIC
   AST.cpp
diff --git a/clang-tools-extra/clangd/indexer/CMakeLists.txt b/clang-tools-extra/clangd/indexer/CMakeLists.txt
index a9438008ea039..76812983833fe 100644
--- a/clang-tools-extra/clangd/indexer/CMakeLists.txt
+++ b/clang-tools-extra/clangd/indexer/CMakeLists.txt
@@ -17,6 +17,7 @@ clang_target_link_libraries(clangd-indexer
 )
 target_link_libraries(clangd-indexer
   PRIVATE
+  clangIncludeCleaner
   clangDaemon
   clangdSupport
 )
diff --git a/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt b/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
index 1d6e38088ad67..67b238e48da9d 100644
--- a/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
+++ b/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
@@ -34,6 +34,7 @@ add_clang_library(clangDaemonTweaks OBJECT
   SwapIfBranches.cpp
 
   LINK_LIBS
+  clangIncludeCleaner
   clangAST
   clangBasic
   clangDaemon
diff --git a/clang-tools-extra/clangd/tool/CMakeLists.txt b/clang-tools-extra/clangd/tool/CMakeLists.txt
index 850a82833e444..eeb45e58682f5 100644
--- a/clang-tools-extra/clangd/tool/CMakeLists.txt
+++ b/clang-tools-extra/clangd/tool/CMakeLists.txt
@@ -32,6 +32,7 @@ clang_target_link_libraries(clangdMain
 
 target_link_libraries(clangdMain
   PRIVATE
+  clangIncludeCleaner
   clangTidy
   clangTidyUtils
 
diff --git a/clang-tools-extra/include-cleaner/CMakeLists.txt b/clang-tools-extra/include-cleaner/CMakeLists.txt
index dc147f9ca08df..1b7015f54bdf1 100644
--- a/clang-tools-extra/include-cleaner/CMakeLists.txt
+++ b/clang-tools-extra/include-cleaner/CMakeLists.txt
@@ -1,4 +1,3 @@
-include_directories(include)
 add_subdirectory(lib)
 add_subdirectory(tool)
 if(CLANG_INCLUDE_TESTS)
diff --git a/clang-tools-extra/include-cleaner/lib/CMakeLists.txt b/clang-tools-extra/include-cleaner/lib/CMakeLists.txt
index 7ad5325f6026d..52c8c1789001a 100644
--- a/clang-tools-extra/include-cleaner/lib/CMakeLists.txt
+++ b/clang-tools-extra/include-cleaner/lib/CMakeLists.txt
@@ -14,6 +14,8 @@ add_clang_library(clangIncludeCleaner STATIC
   ClangDriverOptions
   )
 
+target_include_directories(clangIncludeCleaner PUBLIC ../include)
+
 clang_target_link_libraries(clangIncludeCleaner
   PRIVATE
   clangAST
diff --git a/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt b/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
index 64bf47e61736c..69f410404ea62 100644
--- a/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
+++ b/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
@@ -15,7 +15,6 @@ endif()
 get_filename_component(CLANG_LINT_SOURCE_DIR
   ${CMAKE_CURRENT_SOURCE_DIR}/../../clang-tidy REALPATH)
 include_directories(${CLANG_LINT_SOURCE_DIR})
-include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../../include-cleaner/include")
 
 add_extra_unittest(ClangTidyTests
   AddConstTest.cpp