Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions clang-tools-extra/clang-tidy/misc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion clang-tools-extra/clangd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions clang-tools-extra/clangd/indexer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ clang_target_link_libraries(clangd-indexer
)
target_link_libraries(clangd-indexer
PRIVATE
clangIncludeCleaner
clangDaemon
clangdSupport
)
1 change: 1 addition & 0 deletions clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ add_clang_library(clangDaemonTweaks OBJECT
SwapIfBranches.cpp

LINK_LIBS
clangIncludeCleaner
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the should be alphabetical
(same with other places)

clangAST
clangBasic
clangDaemon
Expand Down
1 change: 1 addition & 0 deletions clang-tools-extra/clangd/tool/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ clang_target_link_libraries(clangdMain

target_link_libraries(clangdMain
PRIVATE
clangIncludeCleaner
clangTidy
clangTidyUtils

Expand Down
1 change: 0 additions & 1 deletion clang-tools-extra/include-cleaner/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include_directories(include)
add_subdirectory(lib)
add_subdirectory(tool)
if(CLANG_INCLUDE_TESTS)
Expand Down
2 changes: 2 additions & 0 deletions clang-tools-extra/include-cleaner/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ add_clang_library(clangIncludeCleaner STATIC
ClangDriverOptions
)

target_include_directories(clangIncludeCleaner PUBLIC ../include)

clang_target_link_libraries(clangIncludeCleaner
PRIVATE
clangAST
Expand Down
1 change: 0 additions & 1 deletion clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down