Merge commit 'ca3610ab8ed9' from swift/release/6.3 into stable/21.x

Author: git apple-llvm automerger

lldb/tools/lldb-dap/CMakeLists.txt

@@ -1,9 +1,6 @@
 # We need to include the llvm components we depend on manually, as liblldb does
 # not re-export those.
 set(LLVM_LINK_COMPONENTS Support)
-set(LLVM_TARGET_DEFINITIONS Options.td)
-tablegen(LLVM Options.inc -gen-opt-parser-defs)
-add_public_tablegen_target(LLDBDAPOptionsTableGen)
 
 add_lldb_library(lldbDAP
   Breakpoint.cpp

lldb/tools/lldb-dap/tool/CMakeLists.txt

@@ -1,10 +1,19 @@
+set(LLVM_TARGET_DEFINITIONS Options.td)
+tablegen(LLVM Options.inc -gen-opt-parser-defs)
+add_public_tablegen_target(LLDBDAPOptionsTableGen)
+
 add_lldb_tool(lldb-dap
   lldb-dap.cpp
 
   LINK_LIBS
     lldbDAP
   )
 
+add_dependencies(lldb-dap
+  LLDBDAPOptionsTableGen
+  ${tablegen_deps}
+)
+
 if(APPLE)
   configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/lldb-dap-Info.plist.in