mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-02 04:09:33 -05:00
Refactor: Rename cmCMakePresetsFile to cmCMakePresetsGraph
And change all references to "file" to say "graph" instead.
This commit is contained in:
@@ -730,12 +730,12 @@ void CMakeSetupDialog::updatePreset(const QString& name)
|
||||
}
|
||||
|
||||
void CMakeSetupDialog::showPresetLoadError(
|
||||
const QString& dir, cmCMakePresetsFile::ReadFileResult result)
|
||||
const QString& dir, cmCMakePresetsGraph::ReadFileResult result)
|
||||
{
|
||||
QMessageBox::warning(
|
||||
this, "Error Reading CMake Presets",
|
||||
QString::fromLocal8Bit("Could not read presets from %1: %2")
|
||||
.arg(dir, cmCMakePresetsFile::ResultToString(result)));
|
||||
.arg(dir, cmCMakePresetsGraph::ResultToString(result)));
|
||||
}
|
||||
|
||||
void CMakeSetupDialog::doBinaryBrowse()
|
||||
|
||||
@@ -60,7 +60,7 @@ protected slots:
|
||||
void updatePresets(const QVector<QCMakePreset>& presets);
|
||||
void updatePreset(const QString& name);
|
||||
void showPresetLoadError(const QString& dir,
|
||||
cmCMakePresetsFile::ReadFileResult result);
|
||||
cmCMakePresetsGraph::ReadFileResult result);
|
||||
void showProgress(const QString& msg, float percent);
|
||||
void setEnabledState(bool);
|
||||
bool setupFirstConfigure();
|
||||
|
||||
+11
-11
@@ -32,7 +32,7 @@ QCMake::QCMake(QObject* p)
|
||||
qRegisterMetaType<QCMakePropertyList>();
|
||||
qRegisterMetaType<QProcessEnvironment>();
|
||||
qRegisterMetaType<QVector<QCMakePreset>>();
|
||||
qRegisterMetaType<cmCMakePresetsFile::ReadFileResult>();
|
||||
qRegisterMetaType<cmCMakePresetsGraph::ReadFileResult>();
|
||||
|
||||
cmSystemTools::DisableRunCommandOutput();
|
||||
cmSystemTools::SetRunCommandHideConsole(true);
|
||||
@@ -69,9 +69,9 @@ QCMake::QCMake(QObject* p)
|
||||
connect(&this->LoadPresetsTimer, &QTimer::timeout, this, [this]() {
|
||||
this->loadPresets();
|
||||
if (!this->PresetName.isEmpty() &&
|
||||
this->CMakePresetsFile.ConfigurePresets.find(
|
||||
this->CMakePresetsGraph.ConfigurePresets.find(
|
||||
std::string(this->PresetName.toLocal8Bit())) ==
|
||||
this->CMakePresetsFile.ConfigurePresets.end()) {
|
||||
this->CMakePresetsGraph.ConfigurePresets.end()) {
|
||||
this->setPreset(QString{});
|
||||
}
|
||||
});
|
||||
@@ -159,7 +159,7 @@ void QCMake::setPreset(const QString& name, bool setBinary)
|
||||
if (!name.isNull()) {
|
||||
std::string presetName(name.toLocal8Bit());
|
||||
auto const& expandedPreset =
|
||||
this->CMakePresetsFile.ConfigurePresets[presetName].Expanded;
|
||||
this->CMakePresetsGraph.ConfigurePresets[presetName].Expanded;
|
||||
if (expandedPreset) {
|
||||
if (setBinary && !expandedPreset->BinaryDir.empty()) {
|
||||
QString binaryDir =
|
||||
@@ -427,7 +427,7 @@ QCMakePropertyList QCMake::properties() const
|
||||
if (!this->PresetName.isNull()) {
|
||||
std::string presetName(this->PresetName.toLocal8Bit());
|
||||
auto const& p =
|
||||
this->CMakePresetsFile.ConfigurePresets.at(presetName).Expanded;
|
||||
this->CMakePresetsGraph.ConfigurePresets.at(presetName).Expanded;
|
||||
if (p) {
|
||||
for (auto const& v : p->CacheVariables) {
|
||||
if (!v.second) {
|
||||
@@ -533,17 +533,17 @@ void QCMake::setUpEnvironment() const
|
||||
|
||||
void QCMake::loadPresets()
|
||||
{
|
||||
auto result = this->CMakePresetsFile.ReadProjectPresets(
|
||||
auto result = this->CMakePresetsGraph.ReadProjectPresets(
|
||||
this->SourceDirectory.toLocal8Bit().data(), true);
|
||||
if (result != this->LastLoadPresetsResult &&
|
||||
result != cmCMakePresetsFile::ReadFileResult::READ_OK) {
|
||||
result != cmCMakePresetsGraph::ReadFileResult::READ_OK) {
|
||||
emit this->presetLoadError(this->SourceDirectory, result);
|
||||
}
|
||||
this->LastLoadPresetsResult = result;
|
||||
|
||||
QVector<QCMakePreset> presets;
|
||||
for (auto const& name : this->CMakePresetsFile.ConfigurePresetOrder) {
|
||||
auto const& it = this->CMakePresetsFile.ConfigurePresets[name];
|
||||
for (auto const& name : this->CMakePresetsGraph.ConfigurePresetOrder) {
|
||||
auto const& it = this->CMakePresetsGraph.ConfigurePresets[name];
|
||||
auto const& p = it.Unexpanded;
|
||||
if (p.Hidden) {
|
||||
continue;
|
||||
@@ -556,10 +556,10 @@ void QCMake::loadPresets()
|
||||
preset.generator = QString::fromLocal8Bit(p.Generator.data());
|
||||
preset.architecture = QString::fromLocal8Bit(p.Architecture.data());
|
||||
preset.setArchitecture = !p.ArchitectureStrategy ||
|
||||
p.ArchitectureStrategy == cmCMakePresetsFile::ArchToolsetStrategy::Set;
|
||||
p.ArchitectureStrategy == cmCMakePresetsGraph::ArchToolsetStrategy::Set;
|
||||
preset.toolset = QString::fromLocal8Bit(p.Toolset.data());
|
||||
preset.setToolset = !p.ToolsetStrategy ||
|
||||
p.ToolsetStrategy == cmCMakePresetsFile::ArchToolsetStrategy::Set;
|
||||
p.ToolsetStrategy == cmCMakePresetsGraph::ArchToolsetStrategy::Set;
|
||||
preset.enabled = it.Expanded && it.Expanded->ConditionResult &&
|
||||
std::find_if(this->AvailableGenerators.begin(),
|
||||
this->AvailableGenerators.end(),
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "cmConfigure.h" // IWYU pragma: keep
|
||||
|
||||
#include "cmCMakePresetsFile.h"
|
||||
#include "cmCMakePresetsGraph.h"
|
||||
#include "cmake.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
@@ -60,7 +60,7 @@ using QCMakePropertyList = QList<QCMakeProperty>;
|
||||
Q_DECLARE_METATYPE(QCMakeProperty)
|
||||
Q_DECLARE_METATYPE(QCMakePropertyList)
|
||||
Q_DECLARE_METATYPE(QProcessEnvironment)
|
||||
Q_DECLARE_METATYPE(cmCMakePresetsFile::ReadFileResult)
|
||||
Q_DECLARE_METATYPE(cmCMakePresetsGraph::ReadFileResult)
|
||||
|
||||
/// Qt API for CMake library.
|
||||
/// Wrapper like class allows for easier integration with
|
||||
@@ -159,7 +159,7 @@ signals:
|
||||
void presetChanged(const QString& name);
|
||||
/// signal when there's an error reading the presets files
|
||||
void presetLoadError(const QString& dir,
|
||||
cmCMakePresetsFile::ReadFileResult error);
|
||||
cmCMakePresetsGraph::ReadFileResult error);
|
||||
/// signal when uninitialized warning changes
|
||||
void warnUninitializedModeChanged(bool value);
|
||||
/// signal for progress events
|
||||
@@ -202,9 +202,9 @@ protected:
|
||||
QString Platform;
|
||||
QString Toolset;
|
||||
std::vector<cmake::GeneratorInfo> AvailableGenerators;
|
||||
cmCMakePresetsFile CMakePresetsFile;
|
||||
cmCMakePresetsFile::ReadFileResult LastLoadPresetsResult =
|
||||
cmCMakePresetsFile::ReadFileResult::READ_OK;
|
||||
cmCMakePresetsGraph CMakePresetsGraph;
|
||||
cmCMakePresetsGraph::ReadFileResult LastLoadPresetsResult =
|
||||
cmCMakePresetsGraph::ReadFileResult::READ_OK;
|
||||
QString PresetName;
|
||||
QString CMakeExecutable;
|
||||
QAtomicInt InterruptFlag;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <QString>
|
||||
#include <QVariant>
|
||||
|
||||
#include "cmCMakePresetsFile.h"
|
||||
#include "cmCMakePresetsGraph.h"
|
||||
|
||||
class QCMakePreset
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user