From 4a0a6f07e7e72f74a452526becfb9c7c867f3be0 Mon Sep 17 00:00:00 2001
From: Artem Sokolovskii <artem.sokolovskii@qt.io>
Date: Fri, 14 Jul 2023 11:07:56 +0200
Subject: [PATCH] DAP: Fix start CMake debug mode

Change-Id: I2951142736b0e6ccf2b08a7bd78b08b1e96bca6f
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/debugger/debuggerengine.h       |  1 -
 src/plugins/debugger/debuggerplugin.cpp     |  1 -
 src/plugins/debugger/debuggerruncontrol.cpp | 12 +++---------
 src/plugins/debugger/debuggerruncontrol.h   |  1 -
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 6e48f8c02b6..cc6baf32d28 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -150,7 +150,6 @@ public:
     bool multiProcess = false; // Whether to set detach-on-fork off.
     bool useTerminal = false;
     bool runAsRoot = false;
-    bool cmakeDapDebugging = false;
 
     ProjectExplorer::Runnable debugger;
     Utils::FilePath overrideStartScript; // Used in attach to core and remote debugging
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index b2d9e46595b..6a6f60f08d5 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1724,7 +1724,6 @@ RunControl *DebuggerPluginPrivate::attachToRunningProcess(Kit *kit,
     debugger->setStartMode(AttachToLocalProcess);
     debugger->setCloseMode(DetachAtClose);
     debugger->setContinueAfterAttach(contAfterAttach);
-    debugger->setCmakeDapDebugging(processInfo.executable.endsWith(QLatin1String("cmake")));
 
     debugger->startRunControl();
 
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 67cefc7b27d..3d97bb89d1e 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -310,11 +310,6 @@ void DebuggerRunTool::setRunAsRoot(bool on)
     m_runParameters.runAsRoot = on;
 }
 
-void DebuggerRunTool::setCmakeDapDebugging(bool on)
-{
-    m_runParameters.cmakeDapDebugging = on;
-}
-
 void DebuggerRunTool::setCommandsAfterConnect(const QString &commands)
 {
     m_runParameters.commandsAfterConnect = commands;
@@ -491,11 +486,10 @@ void DebuggerRunTool::start()
 
     runControl()->setDisplayName(m_runParameters.displayName);
 
-    if (!m_engine && m_runParameters.cmakeDapDebugging)
-        m_engine = createDapEngine();
-
     if (!m_engine) {
-        if (m_runParameters.isCppDebugging()) {
+        if (runControl()->runMode() == ProjectExplorer::Constants::CMAKE_DEBUG_RUN_MODE)
+            m_engine = createDapEngine();
+        else if (m_runParameters.isCppDebugging()) {
             switch (m_runParameters.cppEngineType) {
             case GdbEngineType:
                 m_engine = createGdbEngine();
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index 44870382732..2bd18508c6a 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -84,7 +84,6 @@ public:
     void setBreakOnMain(bool on);
     void setUseTerminal(bool on);
     void setRunAsRoot(bool on);
-    void setCmakeDapDebugging(bool on);
 
     void setCommandsAfterConnect(const QString &commands);
     void setCommandsForReset(const QString &commands);