From 2a00e1c2ab64f88212794e9e02b500e482f7823f Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Fri, 31 Oct 2025 18:13:35 -0700 Subject: [PATCH 1/2] [lldb-dap] Move Options.td into tool subdirectory (NFC) (#165925) (cherry picked from commit 128af4503aa3c5dac50ccbe50dec4ecc56d2cfb2) --- lldb/tools/lldb-dap/CMakeLists.txt | 3 --- lldb/tools/lldb-dap/tool/CMakeLists.txt | 4 ++++ lldb/tools/lldb-dap/{ => tool}/Options.td | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename lldb/tools/lldb-dap/{ => tool}/Options.td (100%) diff --git a/lldb/tools/lldb-dap/CMakeLists.txt b/lldb/tools/lldb-dap/CMakeLists.txt index 5e0ad53b82f89..34a77a612d05f 100644 --- a/lldb/tools/lldb-dap/CMakeLists.txt +++ b/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 diff --git a/lldb/tools/lldb-dap/tool/CMakeLists.txt b/lldb/tools/lldb-dap/tool/CMakeLists.txt index b39a4ed9c40e7..5335d25c5d450 100644 --- a/lldb/tools/lldb-dap/tool/CMakeLists.txt +++ b/lldb/tools/lldb-dap/tool/CMakeLists.txt @@ -1,3 +1,7 @@ +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 diff --git a/lldb/tools/lldb-dap/Options.td b/lldb/tools/lldb-dap/tool/Options.td similarity index 100% rename from lldb/tools/lldb-dap/Options.td rename to lldb/tools/lldb-dap/tool/Options.td From bc328e45e5219a2173c7754c7001b621e52c100c Mon Sep 17 00:00:00 2001 From: Dave Lee Date: Thu, 18 Dec 2025 13:39:12 -0800 Subject: [PATCH 2/2] [lldb-dap] Add missing tablegen dependency to lldb-dap (#172891) rdar://165929985 (cherry picked from commit 56db2416ff3e3725b48669f0fa94ea6c0f97f51a) --- lldb/tools/lldb-dap/tool/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lldb/tools/lldb-dap/tool/CMakeLists.txt b/lldb/tools/lldb-dap/tool/CMakeLists.txt index 5335d25c5d450..692aeedd9531b 100644 --- a/lldb/tools/lldb-dap/tool/CMakeLists.txt +++ b/lldb/tools/lldb-dap/tool/CMakeLists.txt @@ -9,6 +9,11 @@ add_lldb_tool(lldb-dap lldbDAP ) +add_dependencies(lldb-dap + LLDBDAPOptionsTableGen + ${tablegen_deps} +) + if(APPLE) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/lldb-dap-Info.plist.in