[CMake] Resurrect add_dependencies() and target_link_libraries()

[chapuni]

Summary

Note, header dependencies are updated since r201842^.

[gribozavr]

Do you update these dependencies by hand or do you have a script or some other automation tool? If you have a script, it would be great if you committed it.

[chandlerc]

This looks good to me, but I'd like Rafael to take a look as well and see if this is the direction he was thinking too.

[chapuni]

Dmitri, header deps were made by hand and by copying from build.ninja generated by my another patch, "tddeps".

See also http://llvm-reviews.chandlerc.com/D2879

[• rafael]

This will always use INTERFACE. The current setup has logic for
deciding between INTERFACE, PUBLIC and PRIVATE. Wont this produce the
wrong result when doing shared builds?

What I had in mind was defining a LLVM_LINK_TYPE that is INTERFACE,
PUBLIC or PRIVATE depending on the build type. Is that possible?

I was looking at AddLLVM.cmake, but I don't quite understand it. For
example, where is ARG_MODULE set?

Cheers,
Rafael

[chandlerc]

This seems stalled. Update and add me back if you want me to take a look at it.

clang-tools-extra/clang-apply-replacements/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_clang_library(clangApplyReplacements
   lib/Tooling/ApplyReplacements.cpp
+  )
+
+add_dependencies(clangApplyReplacements
+  ClangDiagnosticCommon
+  )
 
-  LINK_LIBS
+target_link_libraries(clangApplyReplacements ${cmake_2_8_12_INTERFACE}
   clangBasic
   clangRewriteCore
   clangTooling
   )
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   include
   )
 add_subdirectory(tool)

clang-tools-extra/clang-modernize/Core/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS support)
 
 add_clang_library(modernizeCore
   ReplacementHandling.cpp
   Transforms.cpp
   Transform.cpp
   IncludeExcludeInfo.cpp
   PerfSupport.cpp
   IncludeDirectives.cpp
+  )
+
+add_dependencies(modernizeCore
+  ClangStmtNodes
+  ClangAttrClasses
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangAttrList
+  )
 
-  LINK_LIBS
+target_link_libraries(modernizeCore ${cmake_2_8_12_INTERFACE}
   clangAST
   clangASTMatchers
   clangBasic
   clangFrontend
   clangLex
   clangTooling
   )

clang-tools-extra/clang-query/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   lineeditor
   support
   )
 
 add_clang_library(clangQuery
   Query.cpp
   QueryParser.cpp
+  )
+
+add_dependencies(clangQuery
+  ClangAttrClasses
+  ClangAttrList
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangQuery ${cmake_2_8_12_INTERFACE}
   clangAST
   clangASTMatchers
   clangBasic
   clangDynamicASTMatchers
   clangFrontend
   )
 
 add_subdirectory(tool)

clang-tools-extra/clang-tidy/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_clang_library(clangTidy
   ClangTidy.cpp
   ClangTidyModule.cpp
   ClangTidyDiagnosticConsumer.cpp
+  )
 
-  DEPENDS
+add_dependencies(clangTidy
+  ClangAttrClasses
+  ClangAttrList
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
   ClangSACheckers
+  )
 
-  LINK_LIBS
+target_link_libraries(clangTidy ${cmake_2_8_12_INTERFACE}
   clangAST
   clangASTMatchers
   clangBasic
   clangFrontend
   clangRewriteCore
   clangStaticAnalyzerFrontend
   clangTooling
   )
 
 add_subdirectory(tool)
 add_subdirectory(llvm)
 add_subdirectory(google)

clang-tools-extra/clang-tidy/google/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS support)
 
 add_clang_library(clangTidyGoogleModule
   GoogleTidyModule.cpp
+  )
+
+add_dependencies(clangTidyGoogleModule
+  ClangAttrClasses
+  ClangAttrList
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangTidyGoogleModule ${cmake_2_8_12_INTERFACE}
   clangAST
   clangASTMatchers
   clangBasic
   clangTidy
   )

clang-tools-extra/clang-tidy/llvm/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS support)
 
 add_clang_library(clangTidyLLVMModule
   LLVMTidyModule.cpp
+  )
+
+add_dependencies(clangTidyLLVMModule
+  ClangAttrClasses
+  ClangAttrList
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangTidyLLVMModule ${cmake_2_8_12_INTERFACE}
   clangAST
   clangASTMatchers
   clangBasic
   clangLex
   clangTidy
   )

clang/CMakeLists.txt

function(clang_tablegen)
   endif()
 
   set( LLVM_TARGET_DEFINITIONS ${CTG_SOURCE} )
   tablegen(CLANG ${CTG_UNPARSED_ARGUMENTS})
 
   if(CTG_TARGET)
     add_public_tablegen_target(${CTG_TARGET})
     set_target_properties( ${CTG_TARGET} PROPERTIES FOLDER "Clang tablegenning")
-    set_property(GLOBAL APPEND PROPERTY CLANG_TABLEGEN_TARGETS ${CTG_TARGET})
   endif()
 endfunction(clang_tablegen)
 
 macro(add_clang_library name)
   cmake_parse_arguments(ARG
     ""
     ""
     "ADDITIONAL_HEADERS"

 set(LIBCLANG_LIBRARY_VERSION
      "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}" CACHE STRING
     "Version number that will be placed into the libclang library , in the form XX.YY")
 mark_as_advanced(CLANG_EXECUTABLE_VERSION LIBCLANG_LIBRARY_VERSION)
 
 add_subdirectory(utils/TableGen)
 
 add_subdirectory(include)
-
-# All targets below may depend on all tablegen'd files.
-get_property(CLANG_TABLEGEN_TARGETS GLOBAL PROPERTY CLANG_TABLEGEN_TARGETS)
-list(APPEND LLVM_COMMON_DEPENDS ${CLANG_TABLEGEN_TARGETS})
-
 add_subdirectory(lib)
 add_subdirectory(tools)
 add_subdirectory(runtime)
 
 option(CLANG_BUILD_EXAMPLES "Build CLANG example programs by default." OFF)
 if (CLANG_BUILD_EXAMPLES)
   set(ENABLE_CLANG_EXAMPLES "1")
 else()

clang/examples/PrintFunctionNames/CMakeLists.txt

 # If we don't need RTTI or EH, there's no reason to export anything
 # from the plugin.
 if( NOT WIN32 ) # Win32 mangles symbols differently, and
                 # PrintFunctionNames.export contains C++ symbols.
   if( NOT LLVM_REQUIRES_RTTI )
     if( NOT LLVM_REQUIRES_EH )
       set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/PrintFunctionNames.exports)
     endif()
   endif()
 endif()
 
 add_llvm_loadable_module(PrintFunctionNames PrintFunctionNames.cpp)
+
+add_dependencies(PrintFunctionNames
+  ClangAttrClasses
+  ClangAttrList
+  ClangCommentCommandList
+  ClangCommentNodes
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
+  )

clang/examples/analyzer-plugin/CMakeLists.txt

 add_llvm_loadable_module(SampleAnalyzerPlugin MainCallChecker.cpp)
+
+add_dependencies(SampleAnalyzerPlugin
+  ClangAttrClasses
+  ClangAttrList
+  ClangCommentCommandList
+  ClangCommentNodes
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
+  )

clang/lib/ARCMigrate/CMakeLists.txt

add_clang_library(clangARCMigrate
   TransProperties.cpp
   TransProtectedScope.cpp
   TransRetainReleaseDealloc.cpp
   TransUnbridgedCasts.cpp
   TransUnusedInitDelegate.cpp
   TransZeroOutPropsInDealloc.cpp
   TransformActions.cpp
   Transforms.cpp
+  )
+
+add_dependencies(clangARCMigrate
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrParsedAttrList
+  ClangAttrVisitor
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangDiagnosticGroups
+  ClangDiagnosticSema
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangARCMigrate ${cmake_2_8_12_INTERFACE}
   clangAST
   clangAnalysis
   clangBasic
   clangEdit
   clangFrontend
   clangLex
   clangRewriteCore
   clangSema
   clangSerialization
   clangStaticAnalyzerCheckers
   )

clang/lib/AST/CMakeLists.txt

add_clang_library(clangAST
   StmtViz.cpp
   TemplateBase.cpp
   TemplateName.cpp
   Type.cpp
   TypeLoc.cpp
   TypePrinter.cpp
   VTableBuilder.cpp
   VTTBuilder.cpp
+  )
+
+add_dependencies(clangAST
+  ClangARMNeon
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrImpl
+  ClangAttrDump
+  ClangAttrVisitor
+  ClangCommentCommandInfo
+  ClangCommentCommandList
+  ClangCommentNodes
+  ClangCommentHTMLTags
+  ClangCommentHTMLTagsProperties
+  ClangCommentHTMLNamedCharacterReferences
+  ClangDeclNodes
+  ClangDiagnosticAST
+  ClangDiagnosticComment
+  ClangDiagnosticCommon
+  ClangDiagnosticSema
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangAST ${cmake_2_8_12_INTERFACE}
   clangBasic
   clangLex
   )

clang/lib/ASTMatchers/CMakeLists.txt

 add_subdirectory(Dynamic)
 
 set(LLVM_LINK_COMPONENTS support)
 
 add_clang_library(clangASTMatchers
   ASTMatchFinder.cpp
   ASTMatchersInternal.cpp
+  )
+
+add_dependencies(clangASTMatchers
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrVisitor
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangASTMatchers ${cmake_2_8_12_INTERFACE}
   clangAST
   )

clang/lib/ASTMatchers/Dynamic/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS support)
 
 add_clang_library(clangDynamicASTMatchers
   Diagnostics.cpp
   VariantValue.cpp
   Parser.cpp
   Registry.cpp
+  )
+
+add_dependencies(clangDynamicASTMatchers
+  ClangAttrClasses
+  ClangAttrList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangDynamicASTMatchers ${cmake_2_8_12_INTERFACE}
   clangAST
   clangASTMatchers
   clangBasic
   )

clang/lib/Analysis/CMakeLists.txt

add_clang_library(clangAnalysis
   PostOrderCFGView.cpp
   PrintfFormatString.cpp
   ProgramPoint.cpp
   PseudoConstantAnalysis.cpp
   ReachableCode.cpp
   ScanfFormatString.cpp
   ThreadSafety.cpp
   UninitializedValues.cpp
+  )
+
+add_dependencies(clangAnalysis
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrVisitor
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangAnalysis ${cmake_2_8_12_INTERFACE}
   clangBasic
   clangAST
   )

clang/lib/Basic/CMakeLists.txt

set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/SVNVersion.inc
     PROPERTIES GENERATED TRUE
                HEADER_FILE_ONLY TRUE)
 
   # Tell Version.cpp that it needs to build with -DHAVE_SVN_VERSION_INC.
   set_source_files_properties(Version.cpp
     PROPERTIES COMPILE_DEFINITIONS "HAVE_SVN_VERSION_INC")
 
 endif()
+
+add_dependencies(clangBasic
+  ClangARMNeon
+  ClangDiagnosticAnalysis
+  ClangDiagnosticAST
+  ClangDiagnosticComment
+  ClangDiagnosticCommon
+  ClangDiagnosticDriver
+  ClangDiagnosticFrontend
+  ClangDiagnosticGroups
+  ClangDiagnosticLex
+  ClangDiagnosticParse
+  ClangDiagnosticSema
+  ClangDiagnosticSerialization
+  )

clang/lib/CodeGen/CMakeLists.txt

add_clang_library(clangCodeGen
   CodeGenTypes.cpp
   ItaniumCXXABI.cpp
   MicrosoftCXXABI.cpp
   ModuleBuilder.cpp
   TargetInfo.cpp
 
   DEPENDS
   intrinsics_gen
+  )
+
+add_dependencies(clangCodeGen
+  ClangARMNeon
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrVisitor
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangDiagnosticFrontend
+  ClangDiagnosticSema
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangCodeGen ${cmake_2_8_12_INTERFACE}
   clangBasic
   clangAST
   clangFrontend
   )

clang/lib/Driver/CMakeLists.txt

add_clang_library(clangDriver
   Phases.cpp
   SanitizerArgs.cpp
   Tool.cpp
   ToolChain.cpp
   ToolChains.cpp
   WindowsToolChain.cpp
   Tools.cpp
   Types.cpp
+  )
 
-  DEPENDS
+add_dependencies(clangDriver
+  ClangAttrList
   ClangCC1AsOptions
+  ClangDiagnosticCommon
+  ClangDiagnosticDriver
   ClangDriverOptions
+  )
 
-  LINK_LIBS
+target_link_libraries(clangDriver ${cmake_2_8_12_INTERFACE}
   clangBasic
   )

clang/lib/Edit/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_clang_library(clangEdit
   Commit.cpp
   EditedSource.cpp
   RewriteObjCFoundationAPI.cpp
+  )
+
+add_dependencies(clangEdit
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangEdit ${cmake_2_8_12_INTERFACE}
   clangBasic
   clangAST
   clangLex
   )

clang/lib/Format/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS support)
 
 add_clang_library(clangFormat
   BreakableToken.cpp
   ContinuationIndenter.cpp
   Format.cpp
   FormatToken.cpp
   TokenAnnotator.cpp
   UnwrappedLineParser.cpp
   WhitespaceManager.cpp
+  )
+
+add_dependencies(clangFormat
+  ClangAttrClasses
+  ClangAttrList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangDiagnosticFrontend
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangFormat ${cmake_2_8_12_INTERFACE}
   clangBasic
   clangLex
   clangTooling
   )

clang/lib/Frontend/CMakeLists.txt

add_clang_library(clangFrontend
   MultiplexConsumer.cpp
   PrintPreprocessedOutput.cpp
   SerializedDiagnosticPrinter.cpp
   TextDiagnostic.cpp
   TextDiagnosticBuffer.cpp
   TextDiagnosticPrinter.cpp
   VerifyDiagnosticConsumer.cpp
   Warnings.cpp
+  )
 
-  DEPENDS
+add_dependencies(clangFrontend
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrParsedAttrList
+  ClangAttrVisitor
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticAST
+  ClangDiagnosticCommon
+  ClangDiagnosticDriver
+  ClangDiagnosticFrontend
+  ClangDiagnosticLex
+  ClangDiagnosticSema
   ClangDriverOptions
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangFrontend ${cmake_2_8_12_INTERFACE}
   clangAST
   clangBasic
   clangDriver
   clangEdit
   clangLex
   clangParse
   clangSema
   clangSerialization
   )

clang/lib/FrontendTool/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Option
   Support
   )
 
-set(link_libs
+add_clang_library(clangFrontendTool
+  ExecuteCompilerInvocation.cpp
+  )
+
+add_dependencies(clangFrontendTool
+  ClangDiagnosticCommon
+  ClangDiagnosticFrontend
+  ClangDriverOptions
+  )
+
+target_link_libraries(clangFrontendTool ${cmake_2_8_12_INTERFACE}
   clangBasic
   clangCodeGen
   clangDriver
   clangFrontend
   clangRewriteFrontend
   )
 
 if(CLANG_ENABLE_ARCMT)
-  list(APPEND link_libs
+  target_link_libraries(clangFrontendTool ${cmake_2_8_12_INTERFACE}
     clangARCMigrate
     )
 endif()
 
 if(CLANG_ENABLE_STATIC_ANALYZER)
-  list(APPEND link_libs
+  target_link_libraries(clangFrontendTool ${cmake_2_8_12_INTERFACE}
     clangStaticAnalyzerFrontend
     )
 endif()
-
-add_clang_library(clangFrontendTool
-  ExecuteCompilerInvocation.cpp
-
-  DEPENDS
-  ClangDriverOptions
-
-  LINK_LIBS
-  ${link_libs}
-  )

clang/lib/Index/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_clang_library(clangIndex
   CommentToXML.cpp
   USRGeneration.cpp
 
   ADDITIONAL_HEADERS
   SimpleFormatContext.h
+  )
+
+add_dependencies(clangIndex
+  ClangAttrClasses
+  ClangAttrList
+  ClangCommentCommandList
+  ClangCommentNodes
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangIndex ${cmake_2_8_12_INTERFACE}
   clangAST
   clangBasic
   clangFormat
   clangLex
   clangRewriteCore
   clangTooling
   )

clang/lib/Lex/CMakeLists.txt

add_clang_library(clangLex
   PTHLexer.cpp
   Pragma.cpp
   PreprocessingRecord.cpp
   Preprocessor.cpp
   PreprocessorLexer.cpp
   ScratchBuffer.cpp
   TokenConcatenation.cpp
   TokenLexer.cpp
+  )
+
+add_dependencies(clangLex
+  ClangAttrSpellings
+  ClangDiagnosticCommon
+  ClangDiagnosticLex
+  )
 
-  LINK_LIBS
+target_link_libraries(clangLex ${cmake_2_8_12_INTERFACE}
   clangBasic
   )

clang/lib/Parse/CMakeLists.txt

add_clang_library(clangParse
   ParseInit.cpp
   ParseObjc.cpp
   ParseOpenMP.cpp
   ParsePragma.cpp
   ParseStmt.cpp
   ParseTemplate.cpp
   ParseTentative.cpp
   Parser.cpp
+  )
+
+add_dependencies(clangParse
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrParsedAttrList
+  ClangAttrParserStringSwitches
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangDiagnosticParse
+  ClangDiagnosticSema
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangParse ${cmake_2_8_12_INTERFACE}
   clangBasic
   clangAST
   clangLex
   clangSema
   )

clang/lib/Rewrite/Core/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_clang_library(clangRewriteCore
   DeltaTree.cpp
   HTMLRewrite.cpp
   RewriteRope.cpp
   Rewriter.cpp
   TokenRewriter.cpp
+  )
+
+add_dependencies(clangRewriteCore
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrParsedAttrList
+  ClangCommentNodes
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangDiagnosticFrontend
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangRewriteCore ${cmake_2_8_12_INTERFACE}
   clangAST
   clangBasic
   clangLex
   )

clang/lib/Rewrite/Frontend/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_clang_library(clangRewriteFrontend
   FixItRewriter.cpp
   FrontendActions.cpp
   HTMLPrint.cpp
   InclusionRewriter.cpp
   RewriteMacros.cpp
   RewriteModernObjC.cpp
   RewriteObjC.cpp
   RewriteTest.cpp
+  )
+
+add_dependencies(clangRewriteFrontend
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrParsedAttrList
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangDiagnosticFrontend
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangRewriteFrontend ${cmake_2_8_12_INTERFACE}
   clangAST
   clangBasic
   clangEdit
   clangFrontend
   clangLex
   clangRewriteCore
   )

clang/lib/Sema/CMakeLists.txt

add_clang_library(clangSema
   SemaStmtAttr.cpp
   SemaTemplate.cpp
   SemaTemplateDeduction.cpp
   SemaTemplateInstantiate.cpp
   SemaTemplateInstantiateDecl.cpp
   SemaTemplateVariadic.cpp
   SemaType.cpp
   TypeLocBuilder.cpp
+  )
+
+add_dependencies(clangSema
+  ClangARMNeon
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrParsedAttrImpl
+  ClangAttrParsedAttrKinds
+  ClangAttrParsedAttrList
+  ClangAttrSpellingListIndex
+  ClangAttrTemplateInstantiate
+  ClangAttrVisitor
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticAST
+  ClangDiagnosticComment
+  ClangDiagnosticCommon
+  ClangDiagnosticParse
+  ClangDiagnosticSema
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangSema ${cmake_2_8_12_INTERFACE}
   clangAST
   clangAnalysis
   clangBasic
   clangEdit
   clangLex
   )

clang/lib/Serialization/CMakeLists.txt

add_clang_library(clangSerialization
   GeneratePCH.cpp
   GlobalModuleIndex.cpp
   Module.cpp
   ModuleManager.cpp
 
   ADDITIONAL_HEADERS
   ASTCommon.h
   ASTReaderInternals.h
+  )
+
+add_dependencies(clangSerialization
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrParsedAttrList
+  ClangAttrPCHRead
+  ClangAttrPCHWrite
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangDiagnosticSema
+  ClangDiagnosticSerialization
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangSerialization ${cmake_2_8_12_INTERFACE}
   clangAST
   clangBasic
   clangLex
   clangSema
   )

clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt

add_clang_library(clangStaticAnalyzerCheckers
   UndefCapturedBlockVarChecker.cpp
   UndefResultChecker.cpp
   UndefinedArraySubscriptChecker.cpp
   UndefinedAssignmentChecker.cpp
   UnixAPIChecker.cpp
   UnreachableCodeChecker.cpp
   VLASizeChecker.cpp
   VirtualCallChecker.cpp
+  )
 
-  DEPENDS
+add_dependencies(clangStaticAnalyzerCheckers
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrVisitor
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
   ClangSACheckers
+  )
 
-  LINK_LIBS
+target_link_libraries(clangStaticAnalyzerCheckers ${cmake_2_8_12_INTERFACE}
   clangAST
   clangAnalysis
   clangBasic
   clangStaticAnalyzerCore
   )

clang/lib/StaticAnalyzer/Core/CMakeLists.txt

add_clang_library(clangStaticAnalyzerCore
   RegionStore.cpp
   SValBuilder.cpp
   SVals.cpp
   SimpleConstraintManager.cpp
   SimpleSValBuilder.cpp
   Store.cpp
   SubEngine.cpp
   SymbolManager.cpp
+  )
+
+add_dependencies(clangStaticAnalyzerCore
+  ClangAttrClasses
+  ClangAttrList
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangStaticAnalyzerCore ${cmake_2_8_12_INTERFACE}
   clangAST
   clangAnalysis
   clangBasic
   clangLex
   clangRewriteCore
   )

clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt

 include_directories( ${CMAKE_CURRENT_BINARY_DIR}/../Checkers )
 
 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_clang_library(clangStaticAnalyzerFrontend
   AnalysisConsumer.cpp
   CheckerRegistration.cpp
   FrontendActions.cpp
+  )
+
+add_dependencies(clangStaticAnalyzerFrontend
+  ClangAttrClasses
+  ClangAttrList
+  ClangAttrVisitor
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangDiagnosticFrontend
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangStaticAnalyzerFrontend ${cmake_2_8_12_INTERFACE}
   clangAST
   clangAnalysis
   clangBasic
   clangFrontend
   clangStaticAnalyzerCheckers
   clangStaticAnalyzerCore
   )

clang/lib/Tooling/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS support)
 
 add_clang_library(clangTooling
   ArgumentsAdjusters.cpp
   CommonOptionsParser.cpp
   CompilationDatabase.cpp
   FileMatchTrie.cpp
   JSONCompilationDatabase.cpp
   Refactoring.cpp
   RefactoringCallbacks.cpp
   Tooling.cpp
+  )
+
+add_dependencies(clangTooling
+  ClangAttrClasses
+  ClangAttrList
+  ClangCommentCommandList
+  ClangDeclNodes
+  ClangDiagnosticCommon
+  ClangDiagnosticDriver
+  ClangDiagnosticFrontend
+  ClangStmtNodes
+  )
 
-  LINK_LIBS
+target_link_libraries(clangTooling ${cmake_2_8_12_INTERFACE}
   clangAST
   clangASTMatchers
   clangBasic
   clangDriver
   clangFrontend
   clangLex
   clangRewriteCore
   )

clang/tools/diagtool/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_clang_executable(diagtool
   diagtool_main.cpp
   DiagTool.cpp
   DiagnosticNames.cpp
   ListWarnings.cpp
   ShowEnabledWarnings.cpp
   TreeView.cpp
 )
 
+add_dependencies(diagtool
+  ClangDiagnosticIndexName
+  )
+
 target_link_libraries(diagtool
   clangBasic
   clangFrontend
   )
 
 if(UNIX)
   set(CLANGXX_LINK_OR_COPY create_symlink)
 else()
   set(CLANGXX_LINK_OR_COPY copy)
 endif()