diff options
17 files changed, 78 insertions, 41 deletions
diff --git a/clang-tools-extra/clang-apply-replacements/CMakeLists.txt b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt index ebc8b6a5f5e6..3b84787ba00d 100644 --- a/clang-tools-extra/clang-apply-replacements/CMakeLists.txt +++ b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt @@ -6,10 +6,9 @@ add_clang_library(clangApplyReplacements lib/Tooling/ApplyReplacements.cpp ) target_link_libraries(clangApplyReplacements - clangTooling clangBasic - clangRewriteFrontend - clangFormat + clangRewriteCore + clangTooling ) include_directories( diff --git a/clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt b/clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt index 6d742408a0fa..8baa0e508371 100644 --- a/clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt +++ b/clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt @@ -7,6 +7,10 @@ add_clang_executable(clang-apply-replacements ) target_link_libraries(clang-apply-replacements clangApplyReplacements + clangBasic + clangFormat + clangRewriteCore + clangTooling ) install(TARGETS clang-apply-replacements diff --git a/clang-tools-extra/clang-modernize/Core/CMakeLists.txt b/clang-tools-extra/clang-modernize/Core/CMakeLists.txt index 784b56026c29..71a9d0dec114 100644 --- a/clang-tools-extra/clang-modernize/Core/CMakeLists.txt +++ b/clang-tools-extra/clang-modernize/Core/CMakeLists.txt @@ -9,9 +9,10 @@ add_clang_library(modernizeCore IncludeDirectives.cpp ) target_link_libraries(modernizeCore - clangFormat - clangTooling - clangBasic + clangAST clangASTMatchers - clangRewriteFrontend + clangBasic + clangFrontend + clangLex + clangTooling ) diff --git a/clang-tools-extra/clang-modernize/tool/CMakeLists.txt b/clang-tools-extra/clang-modernize/tool/CMakeLists.txt index 9e574d422a56..a60764039d71 100644 --- a/clang-tools-extra/clang-modernize/tool/CMakeLists.txt +++ b/clang-tools-extra/clang-modernize/tool/CMakeLists.txt @@ -34,6 +34,13 @@ add_dependencies(clang-modernize ) target_link_libraries(clang-modernize + clangAST + clangASTMatchers + clangBasic + clangFormat + clangFrontend + clangLex + clangTooling modernizeCore ) diff --git a/clang-tools-extra/clang-query/CMakeLists.txt b/clang-tools-extra/clang-query/CMakeLists.txt index 92332599075a..ae748369f13c 100644 --- a/clang-tools-extra/clang-query/CMakeLists.txt +++ b/clang-tools-extra/clang-query/CMakeLists.txt @@ -1,3 +1,7 @@ +set(LLVM_LINK_COMPONENTS + Support + ) + add_clang_library(clangQuery Query.cpp QueryParser.cpp diff --git a/clang-tools-extra/clang-tidy/CMakeLists.txt b/clang-tools-extra/clang-tidy/CMakeLists.txt index a8f86877fe21..a1610b7e3dfb 100644 --- a/clang-tools-extra/clang-tidy/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/CMakeLists.txt @@ -7,11 +7,13 @@ add_clang_library(clangTidy ClangTidyModule.cpp ) target_link_libraries(clangTidy - clangTooling + clangAST + clangASTMatchers clangBasic - clangRewriteFrontend + clangFrontend + clangRewriteCore clangStaticAnalyzerFrontend - clangStaticAnalyzerCheckers + clangTooling ) add_subdirectory(tool) diff --git a/clang-tools-extra/clang-tidy/google/CMakeLists.txt b/clang-tools-extra/clang-tidy/google/CMakeLists.txt index bb440763f4f5..7d053c7d869b 100644 --- a/clang-tools-extra/clang-tidy/google/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/google/CMakeLists.txt @@ -4,8 +4,8 @@ add_clang_library(clangTidyGoogleModule GoogleTidyModule.cpp ) target_link_libraries(clangTidyGoogleModule - clangTidy - clangTooling - clangBasic + clangAST clangASTMatchers + clangBasic + clangTidy ) diff --git a/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt b/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt index dd669f3d0f3b..cf3930aa2bf1 100644 --- a/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt @@ -4,8 +4,9 @@ add_clang_library(clangTidyLLVMModule LLVMTidyModule.cpp ) target_link_libraries(clangTidyLLVMModule - clangTidy - clangTooling - clangBasic + clangAST clangASTMatchers + clangBasic + clangLex + clangTidy ) diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt index 536ee93812db..72df967d258f 100644 --- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt @@ -6,10 +6,12 @@ add_clang_executable(clang-tidy ClangTidyMain.cpp ) target_link_libraries(clang-tidy + clangAST + clangASTMatchers clangTidy - clangTidyLLVMModule clangTidyGoogleModule - clangStaticAnalyzerCheckers + clangTidyLLVMModule + clangTooling ) install(TARGETS clang-tidy diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt index 2093f41b565f..6919e8594012 100644 --- a/clang-tools-extra/modularize/CMakeLists.txt +++ b/clang-tools-extra/modularize/CMakeLists.txt @@ -10,7 +10,9 @@ add_clang_executable(modularize ) target_link_libraries(modularize - clangTooling clangBasic - clangRewriteFrontend + clangDriver + clangFrontend + clangLex + clangTooling ) diff --git a/clang-tools-extra/pp-trace/CMakeLists.txt b/clang-tools-extra/pp-trace/CMakeLists.txt index 23000bb3a63e..95a1f10a4a01 100644 --- a/clang-tools-extra/pp-trace/CMakeLists.txt +++ b/clang-tools-extra/pp-trace/CMakeLists.txt @@ -8,8 +8,9 @@ add_clang_executable(pp-trace ) target_link_libraries(pp-trace + clangAST + clangBasic + clangFrontend clangLex - clangParse - clangSema clangTooling ) diff --git a/clang-tools-extra/remove-cstr-calls/CMakeLists.txt b/clang-tools-extra/remove-cstr-calls/CMakeLists.txt index 4ba2ee98df42..36e93181be10 100644 --- a/clang-tools-extra/remove-cstr-calls/CMakeLists.txt +++ b/clang-tools-extra/remove-cstr-calls/CMakeLists.txt @@ -1,6 +1,16 @@ +set(LLVM_LINK_COMPONENTS + Support + ) + add_clang_executable(remove-cstr-calls RemoveCStrCalls.cpp ) target_link_libraries(remove-cstr-calls - clangEdit clangTooling clangBasic clangAST clangASTMatchers) + clangAST + clangASTMatchers + clangBasic + clangFrontend + clangLex + clangTooling + ) diff --git a/clang-tools-extra/tool-template/CMakeLists.txt b/clang-tools-extra/tool-template/CMakeLists.txt index cf14a9f524c4..8223e4c8881c 100644 --- a/clang-tools-extra/tool-template/CMakeLists.txt +++ b/clang-tools-extra/tool-template/CMakeLists.txt @@ -1,6 +1,15 @@ +set(LLVM_LINK_COMPONENTS + Support + ) + add_clang_executable(tool-template ToolTemplate.cpp ) target_link_libraries(tool-template - clangEdit clangTooling clangBasic clangAST clangASTMatchers) + clangAST + clangASTMatchers + clangBasic + clangFrontend + clangTooling + ) diff --git a/clang-tools-extra/unittests/clang-apply-replacements/CMakeLists.txt b/clang-tools-extra/unittests/clang-apply-replacements/CMakeLists.txt index 9da1410178c2..57d061075068 100644 --- a/clang-tools-extra/unittests/clang-apply-replacements/CMakeLists.txt +++ b/clang-tools-extra/unittests/clang-apply-replacements/CMakeLists.txt @@ -1,10 +1,3 @@ -set(LLVM_LINK_COMPONENTS - asmparser - bitreader - support - mc - ) - get_filename_component(ClangApplyReplacementsLocation "${CMAKE_CURRENT_SOURCE_DIR}/../../clang-apply-replacements/include" REALPATH) get_filename_component(CommonIncLocation @@ -20,4 +13,5 @@ add_extra_unittest(ClangApplyReplacementsTests target_link_libraries(ClangApplyReplacementsTests clangApplyReplacements + clangTooling ) diff --git a/clang-tools-extra/unittests/clang-modernize/CMakeLists.txt b/clang-tools-extra/unittests/clang-modernize/CMakeLists.txt index 80fd4a74bd07..3b023dee7fbb 100644 --- a/clang-tools-extra/unittests/clang-modernize/CMakeLists.txt +++ b/clang-tools-extra/unittests/clang-modernize/CMakeLists.txt @@ -23,10 +23,10 @@ add_extra_unittest(ClangModernizeTests ) target_link_libraries(ClangModernizeTests - modernizeCore - clangFormat - clangTooling - clangBasic + clangAST clangASTMatchers - clangRewriteFrontend + clangBasic + clangFrontend + clangTooling + modernizeCore ) diff --git a/clang-tools-extra/unittests/clang-query/CMakeLists.txt b/clang-tools-extra/unittests/clang-query/CMakeLists.txt index 021009aa6b83..25b7533a2e01 100644 --- a/clang-tools-extra/unittests/clang-query/CMakeLists.txt +++ b/clang-tools-extra/unittests/clang-query/CMakeLists.txt @@ -12,6 +12,7 @@ add_extra_unittest(ClangQueryTests ) target_link_libraries(ClangQueryTests + clangAST clangASTMatchers clangQuery clangTooling diff --git a/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt b/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt index c0f94cc928d8..2778571789d2 100644 --- a/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt +++ b/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt @@ -11,12 +11,12 @@ add_extra_unittest(ClangTidyTests GoogleModuleTest.cpp) target_link_libraries(ClangTidyTests - gtest - gtest_main + clangAST + clangASTMatchers + clangBasic + clangFrontend clangTidy - clangTidyLLVMModule clangTidyGoogleModule + clangTidyLLVMModule clangTooling - clangBasic - clangASTMatchers ) |