cmake: add missing dependencies on ClangDriverOptions tablegen

jroelofs · jroelofs · commit 2fb1c1082c01 · 2023-08-04T10:27:19.000-07:00
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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
   )
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
   )
diff --git 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
   )
diff --git 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
   )
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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)
diff --git 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
   )
diff --git a/clang/lib/ASTMatchers/CMakeLists.txt b/clang/lib/ASTMatchers/CMakeLists.txt
@@ -17,4 +17,5 @@ add_clang_library(clangASTMatchers
 
   DEPENDS
   omp_gen
+  ClangDriverOptions
   )
diff --git 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
   )
diff --git 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)
diff --git 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
diff --git a/clang/lib/Index/CMakeLists.txt b/clang/lib/Index/CMakeLists.txt
diff --git a/clang/lib/Parse/CMakeLists.txt b/clang/lib/Parse/CMakeLists.txt
diff --git a/clang/lib/Sema/CMakeLists.txt b/clang/lib/Sema/CMakeLists.txt
diff --git a/clang/lib/Serialization/CMakeLists.txt b/clang/lib/Serialization/CMakeLists.txt
diff --git a/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt b/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@ set(LLVM_LINK_COMPONENTS`
`4`	`4`
`5`	`5`	`add_clang_library(clangApplyReplacements`
`6`	`6`	`lib/Tooling/ApplyReplacements.cpp`
	`7`	`+`
	`8`	`+ DEPENDS`
	`9`	`+ ClangDriverOptions`
`7`	`10`	`)`
`8`	`11`
`9`	`12`	`clang_target_link_libraries(clangApplyReplacements`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ add_clang_library(clangChangeNamespace`
`8`	`8`
`9`	`9`	`DEPENDS`
`10`	`10`	`omp_gen`
	`11`	`+ ClangDriverOptions`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`clang_target_link_libraries(clangChangeNamespace`