forked from qt-creator/qt-creator
DAP: Add check that cmake 3.27 or higher
If CMake version is lower then 3.27 - Shows the warning in general message - Starts CMake without debugging - Stops debugging correctly Change-Id: Ibb13555c20ae2961c0a3c2ef6ec0fcc25930dddc Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -191,11 +191,15 @@ void CMakeBuildSystem::triggerParsing()
|
|||||||
// active code model updater when the next one will be triggered.
|
// active code model updater when the next one will be triggered.
|
||||||
m_cppCodeModelUpdater->cancel();
|
m_cppCodeModelUpdater->cancel();
|
||||||
|
|
||||||
|
const CMakeTool *tool = m_parameters.cmakeTool();
|
||||||
|
CMakeTool::Version version = tool ? tool->version() : CMakeTool::Version();
|
||||||
|
const bool isDebuggable = (version.major == 3 && version.minor >= 27) || version.major > 3;
|
||||||
|
|
||||||
qCDebug(cmakeBuildSystemLog) << "Asking reader to parse";
|
qCDebug(cmakeBuildSystemLog) << "Asking reader to parse";
|
||||||
m_reader.parse(reparseParameters & REPARSE_FORCE_CMAKE_RUN,
|
m_reader.parse(reparseParameters & REPARSE_FORCE_CMAKE_RUN,
|
||||||
reparseParameters & REPARSE_FORCE_INITIAL_CONFIGURATION,
|
reparseParameters & REPARSE_FORCE_INITIAL_CONFIGURATION,
|
||||||
reparseParameters & REPARSE_FORCE_EXTRA_CONFIGURATION,
|
reparseParameters & REPARSE_FORCE_EXTRA_CONFIGURATION,
|
||||||
reparseParameters & REPARSE_DEBUG);
|
(reparseParameters & REPARSE_DEBUG) && isDebuggable);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMakeBuildSystem::requestDebugging()
|
void CMakeBuildSystem::requestDebugging()
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
|
|
||||||
#include "cmakedapengine.h"
|
#include "cmakedapengine.h"
|
||||||
|
|
||||||
|
#include <coreplugin/messagemanager.h>
|
||||||
|
|
||||||
#include <debugger/debuggermainwindow.h>
|
#include <debugger/debuggermainwindow.h>
|
||||||
|
|
||||||
#include <utils/temporarydirectory.h>
|
#include <utils/temporarydirectory.h>
|
||||||
@@ -14,6 +16,7 @@
|
|||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QLocalSocket>
|
#include <QLocalSocket>
|
||||||
#include <QLoggingCategory>
|
#include <QLoggingCategory>
|
||||||
|
#include <QTimer>
|
||||||
|
|
||||||
using namespace Core;
|
using namespace Core;
|
||||||
using namespace Utils;
|
using namespace Utils;
|
||||||
@@ -112,6 +115,16 @@ void CMakeDapEngine::setupEngine()
|
|||||||
[this] { m_dataGenerator->start(); });
|
[this] { m_dataGenerator->start(); });
|
||||||
|
|
||||||
ProjectExplorer::ProjectTree::currentBuildSystem()->requestDebugging();
|
ProjectExplorer::ProjectTree::currentBuildSystem()->requestDebugging();
|
||||||
|
|
||||||
|
QTimer::singleShot(5000, this, [this] {
|
||||||
|
if (!m_dataGenerator->isRunning()) {
|
||||||
|
m_dataGenerator->kill();
|
||||||
|
MessageManager::writeDisrupting(
|
||||||
|
"CMake server is not running. Please check that your CMake is 3.27 or higher.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
notifyEngineSetupOk();
|
notifyEngineSetupOk();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,8 +41,8 @@
|
|||||||
|
|
||||||
#include <projectexplorer/buildconfiguration.h>
|
#include <projectexplorer/buildconfiguration.h>
|
||||||
#include <projectexplorer/buildsystem.h>
|
#include <projectexplorer/buildsystem.h>
|
||||||
#include <projectexplorer/projecttree.h>
|
|
||||||
#include <projectexplorer/projectexplorerconstants.h>
|
#include <projectexplorer/projectexplorerconstants.h>
|
||||||
|
#include <projectexplorer/projecttree.h>
|
||||||
|
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|||||||
@@ -830,8 +830,8 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(const QStringList &arguments)
|
|||||||
});
|
});
|
||||||
|
|
||||||
connect(&m_startCmakeAction, &QAction::triggered, this, [] {
|
connect(&m_startCmakeAction, &QAction::triggered, this, [] {
|
||||||
// ProjectTree::currentBuildSystem()->requestDebugging();
|
ProjectExplorerPlugin::runStartupProject(ProjectExplorer::Constants::CMAKE_DEBUG_RUN_MODE,
|
||||||
ProjectExplorerPlugin::runStartupProject(ProjectExplorer::Constants::CMAKE_DEBUG_RUN_MODE, true);
|
true);
|
||||||
});
|
});
|
||||||
|
|
||||||
connect(&m_debugWithoutDeployAction, &QAction::triggered, this, [] {
|
connect(&m_debugWithoutDeployAction, &QAction::triggered, this, [] {
|
||||||
|
|||||||
Reference in New Issue
Block a user