mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 05:39:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmake-presets: Add build and test presets

Browse Source 
Fixes: #21391
This commit is contained in:
Sam Freed
2020-12-14 10:06:08 -08:00
committed by Brad King
parent 4f4f2028b8
commit 676ecf0d37
9 changed files with 1929 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/QtDialog/QCMake.cxx
+7 -6
View File
@@ -68,9 +68,9 @@ QCMake::QCMake(QObject* p)
connect(&this->LoadPresetsTimer, &QTimer::timeout, this, [this]() {
this->loadPresets();
if (!this->PresetName.isEmpty() &&
this->CMakePresetsFile.Presets.find(
this->CMakePresetsFile.ConfigurePresets.find(
std::string(this->PresetName.toLocal8Bit())) ==
this->CMakePresetsFile.Presets.end()) {
this->CMakePresetsFile.ConfigurePresets.end()) {
this->setPreset(QString{});
}
});
@@ -158,7 +158,7 @@ void QCMake::setPreset(const QString& name, bool setBinary)
if (!name.isNull()) {
std::string presetName(name.toLocal8Bit());
auto const& expandedPreset =
this->CMakePresetsFile.Presets[presetName].Expanded;
this->CMakePresetsFile.ConfigurePresets[presetName].Expanded;
if (expandedPreset) {
if (setBinary) {
QString binaryDir =
@@ -420,7 +420,8 @@ QCMakePropertyList QCMake::properties() const
if (!this->PresetName.isNull()) {
std::string presetName(this->PresetName.toLocal8Bit());
auto const& p = this->CMakePresetsFile.Presets.at(presetName).Expanded;
auto const& p =
this->CMakePresetsFile.ConfigurePresets.at(presetName).Expanded;
if (p) {
for (auto const& v : p->CacheVariables) {
if (!v.second) {
@@ -535,8 +536,8 @@ void QCMake::loadPresets()
this->LastLoadPresetsResult = result;
QVector<QCMakePreset> presets;
for (auto const& name : this->CMakePresetsFile.PresetOrder) {
auto const& it = this->CMakePresetsFile.Presets[name];
for (auto const& name : this->CMakePresetsFile.ConfigurePresetOrder) {
auto const& it = this->CMakePresetsFile.ConfigurePresets[name];
auto const& p = it.Unexpanded;
if (p.Hidden) {
continue;