[clang-include-cleaner] Export public headers as part of the CMake target #167110
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
localspook requested review from HerrCai0907, HighCommander4, VitaNuo, carlosgalvezp, hokein and vbvictor 
Member
| @llvm/pr-subscribers-clang-tidy @llvm/pr-subscribers-clangd Author: Victor Chernyakin (localspook) ChangesSo that tools that use include-cleaner, like clangd and clang-tidy, don't need to do ugly manual header management. Full diff: https://github.com/llvm/llvm-project/pull/167110.diff 5 Files Affected:
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/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 |
localspook force-pushed the include-cleaner-headers branch from 9f06ba0 to da8121e Compare 
vbvictor reviewed Nov 8, 2025
| @@ -34,6 +34,7 @@ add_clang_library(clangDaemonTweaks OBJECT | |||
| SwapIfBranches.cpp | |||
| | |||
| LINK_LIBS | |||
| clangIncludeCleaner | |||
Contributor
There was a problem hiding this comment.
I guess the should be alphabetical
(same with other places)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
So that tools that use include-cleaner, like clangd and clang-tidy, don't need to do ugly manual header management.