cmake: add missing dependencies on ClangDriverOptions tablegen

The modules build trips over this frequently because there is no textual include of the tablegen output, but the module includes it. Differential revision: https://reviews.llvm.org/D157119
2023-05-10 11:48:11 -07:00 · 2023-05-10 11:48:11 -07:00 · 2fb1c1082c
commit 2fb1c1082c
parent 4185656625
54 changed files with 70 additions and 0 deletions
--- a/clang-tools-extra/clang-apply-replacements/CMakeLists.txt
+++ b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt
@ -4,6 +4,9 @@ set(LLVM_LINK_COMPONENTS

 add_clang_library(clangApplyReplacements
  lib/Tooling/ApplyReplacements.cpp
+
+  DEPENDS
+  ClangDriverOptions
 )

 clang_target_link_libraries(clangApplyReplacements
--- a/clang-tools-extra/clang-change-namespace/CMakeLists.txt
+++ b/clang-tools-extra/clang-change-namespace/CMakeLists.txt
@ -8,6 +8,7 @@ add_clang_library(clangChangeNamespace

  DEPENDS
  omp_gen
+  ClangDriverOptions
 )

 clang_target_link_libraries(clangChangeNamespace
--- a/clang-tools-extra/clang-doc/CMakeLists.txt
+++ b/clang-tools-extra/clang-doc/CMakeLists.txt
@ -18,6 +18,7 @@ add_clang_library(clangDoc

  DEPENDS
  omp_gen
+  ClangDriverOptions
 )

 clang_target_link_libraries(clangDoc
--- a/clang-tools-extra/clang-include-fixer/CMakeLists.txt
+++ b/clang-tools-extra/clang-include-fixer/CMakeLists.txt
@ -15,6 +15,7 @@ add_clang_library(clangIncludeFixer

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangIncludeFixer
--- a/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt
+++ b/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt
@ -15,6 +15,7 @@ add_clang_library(findAllSymbols

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(findAllSymbols
--- a/clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt
+++ b/clang-tools-extra/clang-include-fixer/plugin/CMakeLists.txt
@ -13,4 +13,5 @@ add_clang_library(clangIncludeFixerPlugin

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )
--- a/clang-tools-extra/clang-move/CMakeLists.txt
+++ b/clang-tools-extra/clang-move/CMakeLists.txt
@ -9,6 +9,7 @@ add_clang_library(clangMove

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangMove
--- a/clang-tools-extra/clang-query/CMakeLists.txt
+++ b/clang-tools-extra/clang-query/CMakeLists.txt
@ -10,6 +10,7 @@ add_clang_library(clangQuery

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangQuery
--- a/clang-tools-extra/clang-reorder-fields/CMakeLists.txt
+++ b/clang-tools-extra/clang-reorder-fields/CMakeLists.txt
@ -8,6 +8,7 @@ add_clang_library(clangReorderFields

  DEPENDS
  omp_gen
+  ClangDriverOptions
 )

 clang_target_link_libraries(clangReorderFields
--- a/clang-tools-extra/clang-tidy/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/CMakeLists.txt
@ -22,6 +22,7 @@ add_clang_library(clangTidy
  DEPENDS
  ClangSACheckers
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidy
--- a/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt
@ -32,6 +32,7 @@ add_clang_library(clangTidyAbseilModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyAbseilModule
--- a/clang-tools-extra/clang-tidy/altera/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/altera/CMakeLists.txt
@ -14,6 +14,9 @@ add_clang_library(clangTidyAlteraModule
  LINK_LIBS
  clangTidy
  clangTidyUtils
+
+  DEPENDS
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyAlteraModule
--- a/clang-tools-extra/clang-tidy/android/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/android/CMakeLists.txt
@ -28,6 +28,7 @@ add_clang_library(clangTidyAndroidModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyAndroidModule
--- a/clang-tools-extra/clang-tidy/boost/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/boost/CMakeLists.txt
@ -13,6 +13,7 @@ add_clang_library(clangTidyBoostModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyBoostModule
--- a/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt
@ -88,6 +88,7 @@ add_clang_library(clangTidyBugproneModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyBugproneModule
--- a/clang-tools-extra/clang-tidy/cert/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/cert/CMakeLists.txt
@ -32,6 +32,7 @@ add_clang_library(clangTidyCERTModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyCERTModule
--- a/clang-tools-extra/clang-tidy/concurrency/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/concurrency/CMakeLists.txt
@ -11,6 +11,9 @@ add_clang_library(clangTidyConcurrencyModule
  LINK_LIBS
  clangTidy
  clangTidyUtils
+
+  DEPENDS
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyConcurrencyModule
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt
@ -45,6 +45,7 @@ add_clang_library(clangTidyCppCoreGuidelinesModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyCppCoreGuidelinesModule
--- a/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt
@ -14,6 +14,7 @@ add_clang_library(clangTidyDarwinModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyDarwinModule
--- a/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt
@ -20,6 +20,7 @@ add_clang_library(clangTidyFuchsiaModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyFuchsiaModule
--- a/clang-tools-extra/clang-tidy/google/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/google/CMakeLists.txt
@ -29,6 +29,7 @@ add_clang_library(clangTidyGoogleModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyGoogleModule
--- a/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt
@ -23,6 +23,7 @@ add_clang_library(clangTidyHICPPModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyHICPPModule
--- a/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt
@ -13,6 +13,7 @@ add_clang_library(clangTidyLinuxKernelModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyLinuxKernelModule
--- a/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt
@ -18,6 +18,7 @@ add_clang_library(clangTidyLLVMModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyLLVMModule
--- a/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt
@ -17,6 +17,7 @@ add_clang_library(clangTidyLLVMLibcModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyLLVMLibcModule
--- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
@ -48,6 +48,7 @@ add_clang_library(clangTidyMiscModule
  DEPENDS
  omp_gen
  genconfusable
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyMiscModule
--- a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
@ -51,6 +51,7 @@ add_clang_library(clangTidyModernizeModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyModernizeModule
--- a/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt
@ -14,6 +14,7 @@ add_clang_library(clangTidyMPIModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyMPIModule
--- a/clang-tools-extra/clang-tidy/objc/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/objc/CMakeLists.txt
@ -21,6 +21,7 @@ add_clang_library(clangTidyObjCModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyObjCModule
--- a/clang-tools-extra/clang-tidy/performance/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/performance/CMakeLists.txt
@ -32,6 +32,7 @@ add_clang_library(clangTidyPerformanceModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyPerformanceModule
--- a/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt
@ -7,6 +7,7 @@ add_clang_library(clangTidyPlugin

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyPlugin
--- a/clang-tools-extra/clang-tidy/portability/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/portability/CMakeLists.txt
@ -16,6 +16,7 @@ add_clang_library(clangTidyPortabilityModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyPortabilityModule
--- a/clang-tools-extra/clang-tidy/readability/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/readability/CMakeLists.txt
@ -58,6 +58,7 @@ add_clang_library(clangTidyReadabilityModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyReadabilityModule
--- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
@ -18,6 +18,7 @@ add_clang_library(clangTidyMain

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyMain
--- a/clang-tools-extra/clang-tidy/utils/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/utils/CMakeLists.txt
@ -30,6 +30,7 @@ add_clang_library(clangTidyUtils

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyUtils
--- a/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt
@ -13,6 +13,7 @@ add_clang_library(clangTidyZirconModule

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangTidyZirconModule
--- a/clang-tools-extra/clangd/index/remote/unimplemented/CMakeLists.txt
+++ b/clang-tools-extra/clangd/index/remote/unimplemented/CMakeLists.txt
@ -7,4 +7,7 @@ add_clang_library(clangdRemoteIndex

  LINK_LIBS
  clangdSupport
+
+  DEPENDS
+  ClangDriverOptions
  )
--- a/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
+++ b/clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
@ -44,4 +44,5 @@ add_clang_library(clangDaemonTweaks OBJECT

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )
--- a/clang-tools-extra/clangd/xpc/CMakeLists.txt
+++ b/clang-tools-extra/clangd/xpc/CMakeLists.txt
@ -22,4 +22,5 @@ add_clang_library(clangdXpcJsonConversions
 add_clang_library(clangdXpcTransport
  XPCTransport.cpp
  LINK_LIBS clangDaemon clangdSupport clangdXpcJsonConversions
+  DEPENDS ClangDriverOptions
  )
--- a/clang-tools-extra/include-cleaner/lib/CMakeLists.txt
+++ b/clang-tools-extra/include-cleaner/lib/CMakeLists.txt
@ -9,6 +9,9 @@ add_clang_library(clangIncludeCleaner
  Record.cpp
  Types.cpp
  WalkAST.cpp
+
+  DEPENDS
+  ClangDriverOptions
  )

 clang_target_link_libraries(clangIncludeCleaner
--- a/clang-tools-extra/modularize/CMakeLists.txt
+++ b/clang-tools-extra/modularize/CMakeLists.txt
@ -10,6 +10,9 @@ add_clang_tool(modularize
  ModularizeUtilities.cpp
  CoverageChecker.cpp
  PreprocessorTracker.cpp
+
+  DEPENDS
+  ClangDriverOptions
  )

 clang_target_link_libraries(modularize
--- a/clang-tools-extra/pp-trace/CMakeLists.txt
+++ b/clang-tools-extra/pp-trace/CMakeLists.txt
@ -5,6 +5,9 @@ set(LLVM_LINK_COMPONENTS
 add_clang_tool(pp-trace
  PPTrace.cpp
  PPCallbacksTracker.cpp
+
+  DEPENDS
+  ClangDriverOptions
  )

 clang_target_link_libraries(pp-trace
--- a/clang-tools-extra/pseudo/lib/CMakeLists.txt
+++ b/clang-tools-extra/pseudo/lib/CMakeLists.txt
@ -17,6 +17,9 @@ add_clang_library(clangPseudo
  clangBasic
  clangLex
  clangPseudoGrammar
+
+  DEPENDS
+  ClangDriverOptions
  )

  target_include_directories(clangPseudo INTERFACE
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@ -455,6 +455,7 @@ get_property(CLANG_TABLEGEN_TARGETS GLOBAL PROPERTY CLANG_TABLEGEN_TARGETS)
 add_custom_target(clang-tablegen-targets
  DEPENDS
  omp_gen
+  ClangDriverOptions
  ${CLANG_TABLEGEN_TARGETS})
 set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "Misc")
 list(APPEND LLVM_COMMON_DEPENDS clang-tablegen-targets)
--- a/clang/lib/AST/CMakeLists.txt
+++ b/clang/lib/AST/CMakeLists.txt
@ -132,5 +132,6 @@ add_clang_library(clangAST
  ClangAttrDocTable
  Opcodes
  omp_gen
+  ClangDriverOptions
  intrinsics_gen
  )
--- a/clang/lib/ASTMatchers/CMakeLists.txt
+++ b/clang/lib/ASTMatchers/CMakeLists.txt
@ -17,4 +17,5 @@ add_clang_library(clangASTMatchers

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )
--- a/clang/lib/ASTMatchers/Dynamic/CMakeLists.txt
+++ b/clang/lib/ASTMatchers/Dynamic/CMakeLists.txt
@ -17,4 +17,5 @@ add_clang_library(clangDynamicASTMatchers

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )
--- a/clang/lib/Analysis/CMakeLists.txt
+++ b/clang/lib/Analysis/CMakeLists.txt
@ -43,6 +43,7 @@ add_clang_library(clangAnalysis

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 add_subdirectory(plugins)
--- a/clang/lib/Basic/CMakeLists.txt
+++ b/clang/lib/Basic/CMakeLists.txt
@ -125,6 +125,7 @@ add_clang_library(clangBasic

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )

 target_link_libraries(clangBasic
--- a/clang/lib/Index/CMakeLists.txt
+++ b/clang/lib/Index/CMakeLists.txt
@ -28,4 +28,5 @@ add_clang_library(clangIndex

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )
--- a/clang/lib/Parse/CMakeLists.txt
+++ b/clang/lib/Parse/CMakeLists.txt
@ -32,4 +32,5 @@ add_clang_library(clangParse

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )
--- a/clang/lib/Sema/CMakeLists.txt
+++ b/clang/lib/Sema/CMakeLists.txt
@ -71,6 +71,7 @@ add_clang_library(clangSema
  DEPENDS
  ClangOpenCLBuiltinsImpl
  omp_gen
+  ClangDriverOptions

  LINK_LIBS
  clangAST
--- a/clang/lib/Serialization/CMakeLists.txt
+++ b/clang/lib/Serialization/CMakeLists.txt
@ -34,4 +34,5 @@ add_clang_library(clangSerialization

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )
--- a/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt
+++ b/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt
@ -148,4 +148,5 @@ add_clang_library(clangStaticAnalyzerCheckers

  DEPENDS
  omp_gen
+  ClangDriverOptions
  )