diff options
-rw-r--r-- | examples/PrintFunctionNames/CMakeLists.txt | 7 | ||||
-rw-r--r-- | examples/analyzer-plugin/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/clang-interpreter/CMakeLists.txt | 31 | ||||
-rw-r--r-- | tools/c-arcmt-test/CMakeLists.txt | 5 | ||||
-rw-r--r-- | tools/c-index-test/CMakeLists.txt | 5 | ||||
-rw-r--r-- | tools/clang-check/CMakeLists.txt | 12 | ||||
-rw-r--r-- | tools/clang-format/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tools/diagtool/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tools/driver/CMakeLists.txt | 34 | ||||
-rw-r--r-- | tools/libclang/CMakeLists.txt | 20 | ||||
-rw-r--r-- | unittests/AST/CMakeLists.txt | 10 | ||||
-rw-r--r-- | unittests/ASTMatchers/CMakeLists.txt | 13 | ||||
-rw-r--r-- | unittests/ASTMatchers/Dynamic/CMakeLists.txt | 11 | ||||
-rw-r--r-- | unittests/Basic/CMakeLists.txt | 4 | ||||
-rw-r--r-- | unittests/Format/CMakeLists.txt | 8 | ||||
-rw-r--r-- | unittests/Frontend/CMakeLists.txt | 7 | ||||
-rw-r--r-- | unittests/Lex/CMakeLists.txt | 10 | ||||
-rw-r--r-- | unittests/Sema/CMakeLists.txt | 11 | ||||
-rw-r--r-- | unittests/Tooling/CMakeLists.txt | 12 |
19 files changed, 106 insertions, 114 deletions
diff --git a/examples/PrintFunctionNames/CMakeLists.txt b/examples/PrintFunctionNames/CMakeLists.txt index ba6a350cd9..492b580c0e 100644 --- a/examples/PrintFunctionNames/CMakeLists.txt +++ b/examples/PrintFunctionNames/CMakeLists.txt @@ -1,6 +1,8 @@ set(MODULE TRUE) -set( LLVM_LINK_COMPONENTS support mc) +set( LLVM_LINK_COMPONENTS + Support + ) add_clang_library(PrintFunctionNames PrintFunctionNames.cpp) @@ -14,8 +16,9 @@ add_dependencies(PrintFunctionNames ) target_link_libraries(PrintFunctionNames - clangFrontend clangAST + clangBasic + clangFrontend ) set_target_properties(PrintFunctionNames diff --git a/examples/analyzer-plugin/CMakeLists.txt b/examples/analyzer-plugin/CMakeLists.txt index ba73030cc3..fa8c4fcb32 100644 --- a/examples/analyzer-plugin/CMakeLists.txt +++ b/examples/analyzer-plugin/CMakeLists.txt @@ -1,6 +1,8 @@ set(MODULE TRUE) -set( LLVM_LINK_COMPONENTS support mc) +set(LLVM_LINK_COMPONENTS + Support + ) add_clang_library(SampleAnalyzerPlugin MainCallChecker.cpp) @@ -14,6 +16,8 @@ add_dependencies(SampleAnalyzerPlugin ) target_link_libraries(SampleAnalyzerPlugin + clangAST + clangAnalysis clangStaticAnalyzerCore ) diff --git a/examples/clang-interpreter/CMakeLists.txt b/examples/clang-interpreter/CMakeLists.txt index 451b4b8672..10df7e7e06 100644 --- a/examples/clang-interpreter/CMakeLists.txt +++ b/examples/clang-interpreter/CMakeLists.txt @@ -1,15 +1,9 @@ set(LLVM_LINK_COMPONENTS - jit - interpreter + Core + ExecutionEngine + JIT + Support nativecodegen - asmparser - bitreader - bitwriter - irreader - codegen - ipo - linker - selectiondag ) add_clang_executable(clang-interpreter @@ -21,19 +15,8 @@ add_dependencies(clang-interpreter ) target_link_libraries(clang-interpreter - clangFrontend - clangSerialization - clangDriver - clangCodeGen - clangSema - clangStaticAnalyzerFrontend - clangStaticAnalyzerCheckers - clangStaticAnalyzerCore - clangAnalysis - clangRewriteCore - clangRewriteFrontend - clangAST - clangParse - clangLex clangBasic + clangCodeGen + clangDriver + clangFrontend ) diff --git a/tools/c-arcmt-test/CMakeLists.txt b/tools/c-arcmt-test/CMakeLists.txt index 1e72261b21..9014ccc309 100644 --- a/tools/c-arcmt-test/CMakeLists.txt +++ b/tools/c-arcmt-test/CMakeLists.txt @@ -1,8 +1,3 @@ -set( LLVM_LINK_COMPONENTS - support - mc - ) - add_clang_executable(c-arcmt-test c-arcmt-test.c ) diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt index d850411f33..736065674f 100644 --- a/tools/c-index-test/CMakeLists.txt +++ b/tools/c-index-test/CMakeLists.txt @@ -1,8 +1,3 @@ -set( LLVM_LINK_COMPONENTS - support - mc - ) - add_clang_executable(c-index-test c-index-test.c ) diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt index 2070de37fc..8b9cd888c8 100644 --- a/tools/clang-check/CMakeLists.txt +++ b/tools/clang-check/CMakeLists.txt @@ -1,9 +1,6 @@ set(LLVM_LINK_COMPONENTS - ${LLVM_TARGETS_TO_BUILD} - asmparser - bitreader - support - mc + Option + Support ) add_clang_executable(clang-check @@ -11,10 +8,13 @@ add_clang_executable(clang-check ) target_link_libraries(clang-check - clangTooling + clangAST clangBasic + clangDriver + clangFrontend clangRewriteFrontend clangStaticAnalyzerFrontend + clangTooling ) install(TARGETS clang-check diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt index 7bb3fbf990..b029f71219 100644 --- a/tools/clang-format/CMakeLists.txt +++ b/tools/clang-format/CMakeLists.txt @@ -1,15 +1,15 @@ set(LLVM_LINK_COMPONENTS support) -set(LLVM_USED_LIBS clangFormat clangTooling clangBasic clangAST) add_clang_executable(clang-format ClangFormat.cpp ) target_link_libraries(clang-format + clangBasic clangFormat + clangLex + clangRewriteCore clangTooling - clangBasic - clangRewriteFrontend ) install(TARGETS clang-format RUNTIME DESTINATION bin) diff --git a/tools/diagtool/CMakeLists.txt b/tools/diagtool/CMakeLists.txt index 8aa2d21d62..c56d8a70c4 100644 --- a/tools/diagtool/CMakeLists.txt +++ b/tools/diagtool/CMakeLists.txt @@ -1,9 +1,5 @@ set(LLVM_LINK_COMPONENTS - ${LLVM_TARGETS_TO_BUILD} - asmparser - bitreader - support - mc + Support ) add_clang_executable(diagtool @@ -21,8 +17,6 @@ add_dependencies(diagtool target_link_libraries(diagtool clangBasic - clangLex - clangSema clangFrontend ) diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt index c94bc771e1..4a96d5f069 100644 --- a/tools/driver/CMakeLists.txt +++ b/tools/driver/CMakeLists.txt @@ -1,14 +1,19 @@ set( LLVM_LINK_COMPONENTS ${LLVM_TARGETS_TO_BUILD} - asmparser - bitreader - bitwriter - irreader - codegen - instrumentation - ipo - linker - selectiondag + Analysis + Core + IPA + IPO + InstCombine + Instrumentation + MC + MCParser + ObjCARCOpts + Option + ScalarOpts + Support + TransformUtils + Vectorize ) add_clang_executable(clang @@ -18,19 +23,10 @@ add_clang_executable(clang ) target_link_libraries(clang - clangFrontendTool - clangAST - clangAnalysis clangBasic - clangCodeGen clangDriver - clangEdit clangFrontend - clangLex - clangParse - clangEdit - clangSema - clangSerialization + clangFrontendTool ) if(CLANG_ENABLE_STATIC_ANALYZER) diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt index b7bde69427..a832c1548a 100644 --- a/tools/libclang/CMakeLists.txt +++ b/tools/libclang/CMakeLists.txt @@ -1,9 +1,6 @@ set(LLVM_LINK_COMPONENTS - ${LLVM_TARGETS_TO_BUILD} - asmparser - support - bitreader - mc + BitReader + Support ) set(SOURCES @@ -43,19 +40,14 @@ set(SOURCES ) set(LIBRARIES - clangIndex clangARCMigrate - clangRewriteCore - clangRewriteFrontend - clangFrontend - clangDriver - clangSerialization - clangSema - clangEdit clangAST + clangBasic + clangFrontend + clangIndex clangLex + clangSema clangTooling - clangBasic ) set(GENERATED_HEADERS diff --git a/unittests/AST/CMakeLists.txt b/unittests/AST/CMakeLists.txt index 70f86d3c73..55b028c158 100644 --- a/unittests/AST/CMakeLists.txt +++ b/unittests/AST/CMakeLists.txt @@ -1,3 +1,7 @@ +set(LLVM_LINK_COMPONENTS + Support + ) + add_clang_unittest(ASTTests ASTContextParentMapTest.cpp ASTTypeTraitsTest.cpp @@ -11,5 +15,9 @@ add_clang_unittest(ASTTests ) target_link_libraries(ASTTests - clangAST clangASTMatchers clangTooling + clangAST + clangASTMatchers + clangBasic + clangFrontend + clangTooling ) diff --git a/unittests/ASTMatchers/CMakeLists.txt b/unittests/ASTMatchers/CMakeLists.txt index 862c6a0fd9..3ace9fe264 100644 --- a/unittests/ASTMatchers/CMakeLists.txt +++ b/unittests/ASTMatchers/CMakeLists.txt @@ -1,15 +1,16 @@ set(LLVM_LINK_COMPONENTS - ${LLVM_TARGETS_TO_BUILD} - asmparser - bitreader - support - mc + Support ) add_clang_unittest(ASTMatchersTests ASTMatchersTest.cpp) target_link_libraries(ASTMatchersTests - gtest gtest_main clangASTMatchers clangTooling) + clangAST + clangASTMatchers + clangBasic + clangFrontend + clangTooling + ) add_subdirectory(Dynamic) diff --git a/unittests/ASTMatchers/Dynamic/CMakeLists.txt b/unittests/ASTMatchers/Dynamic/CMakeLists.txt index eb9fa549e1..8b95a7be6e 100644 --- a/unittests/ASTMatchers/Dynamic/CMakeLists.txt +++ b/unittests/ASTMatchers/Dynamic/CMakeLists.txt @@ -1,7 +1,16 @@ +set(LLVM_LINK_COMPONENTS + Support + ) + add_clang_unittest(DynamicASTMatchersTests VariantValueTest.cpp ParserTest.cpp RegistryTest.cpp) target_link_libraries(DynamicASTMatchersTests - gtest gtest_main clangASTMatchers clangDynamicASTMatchers clangTooling) + clangAST + clangASTMatchers + clangDynamicASTMatchers + clangFrontend + clangTooling + ) diff --git a/unittests/Basic/CMakeLists.txt b/unittests/Basic/CMakeLists.txt index 51db6ce9e2..e8b766cc8a 100644 --- a/unittests/Basic/CMakeLists.txt +++ b/unittests/Basic/CMakeLists.txt @@ -1,3 +1,7 @@ +set(LLVM_LINK_COMPONENTS + Support + ) + add_clang_unittest(BasicTests CharInfoTest.cpp FileManagerTest.cpp diff --git a/unittests/Format/CMakeLists.txt b/unittests/Format/CMakeLists.txt index 83aadb56b9..89c7055d5a 100644 --- a/unittests/Format/CMakeLists.txt +++ b/unittests/Format/CMakeLists.txt @@ -1,9 +1,5 @@ set(LLVM_LINK_COMPONENTS - ${LLVM_TARGETS_TO_BUILD} - asmparser - bitreader - support - mc + Support ) add_clang_unittest(FormatTests @@ -12,8 +8,6 @@ add_clang_unittest(FormatTests ) target_link_libraries(FormatTests - clangAST clangFormat clangTooling - clangRewriteCore ) diff --git a/unittests/Frontend/CMakeLists.txt b/unittests/Frontend/CMakeLists.txt index c65a1638a4..cdc955944b 100644 --- a/unittests/Frontend/CMakeLists.txt +++ b/unittests/Frontend/CMakeLists.txt @@ -1,14 +1,11 @@ set(LLVM_LINK_COMPONENTS - ${LLVM_TARGETS_TO_BUILD} - asmparser - bitreader - support - mc + Support ) add_clang_unittest(FrontendTests FrontendActionTest.cpp ) target_link_libraries(FrontendTests + clangAST clangFrontend ) diff --git a/unittests/Lex/CMakeLists.txt b/unittests/Lex/CMakeLists.txt index cb3b9275db..461e0d95fc 100644 --- a/unittests/Lex/CMakeLists.txt +++ b/unittests/Lex/CMakeLists.txt @@ -1,3 +1,7 @@ +set(LLVM_LINK_COMPONENTS + Support + ) + add_clang_unittest(LexTests LexerTest.cpp PPCallbacksTest.cpp @@ -5,5 +9,9 @@ add_clang_unittest(LexTests ) target_link_libraries(LexTests - clangLex clangParse clangSema + clangAST + clangBasic + clangLex + clangParse + clangSema ) diff --git a/unittests/Sema/CMakeLists.txt b/unittests/Sema/CMakeLists.txt index d491655d41..c25db814b7 100644 --- a/unittests/Sema/CMakeLists.txt +++ b/unittests/Sema/CMakeLists.txt @@ -1,7 +1,16 @@ +set(LLVM_LINK_COMPONENTS + Support + ) + add_clang_unittest(SemaTests ExternalSemaSourceTest.cpp ) target_link_libraries(SemaTests - clangAST clangASTMatchers clangTooling + clangAST + clangBasic + clangFrontend + clangParse + clangSema + clangTooling ) diff --git a/unittests/Tooling/CMakeLists.txt b/unittests/Tooling/CMakeLists.txt index 33d7617007..c59ff87b59 100644 --- a/unittests/Tooling/CMakeLists.txt +++ b/unittests/Tooling/CMakeLists.txt @@ -1,9 +1,5 @@ set(LLVM_LINK_COMPONENTS - ${LLVM_TARGETS_TO_BUILD} - asmparser - bitreader - support - mc + Support ) add_clang_unittest(ToolingTests @@ -19,6 +15,10 @@ add_clang_unittest(ToolingTests target_link_libraries(ToolingTests clangAST - clangTooling + clangASTMatchers + clangBasic + clangFrontend + clangLex clangRewriteCore + clangTooling ) |