feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMakePM: Add support for build CMake presets

Browse Source 
This patchset will add support for version 2 of the CMakePresets
feature that has been implemented in CMake 3.20

https://cmake.org/cmake/help/v3.20/manual/cmake-presets.7.html

Task-number: QTCREATORBUG-24555
Change-Id: I08934243cc04487d38c4b59c2ad4a4a8d0484492
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2022-09-05 20:09:12 +02:00
parent 860d003a34
commit e02f4a0518
11 changed files with 661 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -88,54 +88,93 @@ Internal::PresetsData CMakeProject::combinePresets(Internal::PresetsData &cmakeP
result.version = cmakePresetsData.version;
result.cmakeMinimimRequired = cmakePresetsData.cmakeMinimimRequired;
QHash<QString, PresetsDetails::ConfigurePreset> configurePresets;
auto combinePresetsInternal = [](auto &presetsHash,
auto &presets,
auto &userPresets,
const QString &presetType) {
// Populate the hash map with the CMakePresets
for (const auto &p : presets)
presetsHash.insert(p.name, p);
// Populate the hash map with the CMakePresets
for (const PresetsDetails::ConfigurePreset &p: cmakePresetsData.configurePresets)
configurePresets.insert(p.name, p);
auto resolveInherits =
[configurePresets](std::vector<PresetsDetails::ConfigurePreset> &configurePresetsList) {
for (PresetsDetails::ConfigurePreset &cp : configurePresetsList) {
if (!cp.inherits)
auto resolveInherits = [](const auto &presetsHash, auto &presetsList) {
for (auto &p : presetsList) {
if (!p.inherits)
continue;
for (const QString &inheritFromName : cp.inherits.value())
if (configurePresets.contains(inheritFromName))
cp.inheritFrom(configurePresets[inheritFromName]);
for (const QString &inheritFromName : p.inherits.value())
if (presetsHash.contains(inheritFromName))
p.inheritFrom(presetsHash[inheritFromName]);
}
};
// First resolve the CMakePresets
resolveInherits(cmakePresetsData.configurePresets);
// First resolve the CMakePresets
resolveInherits(presetsHash, presets);
// Add the CMakeUserPresets to the resolve hash map
for (const PresetsDetails::ConfigurePreset &cp : cmakeUserPresetsData.configurePresets) {
if (configurePresets.contains(cp.name)) {
TaskHub::addTask(BuildSystemTask(
Task::TaskType::Error,
tr("CMakeUserPresets.json cannot re-define the configure preset: %1").arg(cp.name),
"CMakeUserPresets.json"));
TaskHub::requestPopup();
} else {
configurePresets.insert(cp.name, cp);
// Add the CMakeUserPresets to the resolve hash map
for (const auto &p : userPresets) {
if (presetsHash.contains(p.name)) {
TaskHub::addTask(
BuildSystemTask(Task::TaskType::Error,
tr("CMakeUserPresets.json cannot re-define the %1 preset: %2")
.arg(presetType)
.arg(p.name),
"CMakeUserPresets.json"));
TaskHub::requestPopup();
} else {
presetsHash.insert(p.name, p);
}
}
}
// Then resolve the CMakeUserPresets
resolveInherits(cmakeUserPresetsData.configurePresets);
// Then resolve the CMakeUserPresets
resolveInherits(presetsHash, userPresets);
// Get both CMakePresets and CMakeUserPresets into the result
result.configurePresets = cmakePresetsData.configurePresets;
// Get both CMakePresets and CMakeUserPresets into the result
auto result = presets;
// std::vector doesn't have append
std::copy(cmakeUserPresetsData.configurePresets.begin(),
cmakeUserPresetsData.configurePresets.end(),
std::back_inserter(result.configurePresets));
// std::vector doesn't have append
std::copy(userPresets.begin(), userPresets.end(), std::back_inserter(result));
return result;
};
QHash<QString, PresetsDetails::ConfigurePreset> configurePresetsHash;
QHash<QString, PresetsDetails::BuildPreset> buildPresetsHash;
result.configurePresets = combinePresetsInternal(configurePresetsHash,
cmakePresetsData.configurePresets,
cmakeUserPresetsData.configurePresets,
"configure");
result.buildPresets = combinePresetsInternal(buildPresetsHash,
cmakePresetsData.buildPresets,
cmakeUserPresetsData.buildPresets,
"build");
return result;
}
void CMakeProject::setupBuildPresets(Internal::PresetsData &presetsData)
{
for (auto &buildPreset : presetsData.buildPresets) {
if (buildPreset.inheritConfigureEnvironment) {
if (!buildPreset.configurePreset) {
TaskHub::addTask(BuildSystemTask(
Task::TaskType::Error,
tr("Build preset %1 is missing a corresponding configure preset.")
.arg(buildPreset.name)));
TaskHub::requestPopup();
}
const QString &configurePresetName = buildPreset.configurePreset.value();
buildPreset.environment
= Utils::findOrDefault(presetsData.configurePresets,
[configurePresetName](
const PresetsDetails::ConfigurePreset &configurePreset) {
return configurePresetName == configurePreset.name;
})
.environment;
}
}
}
void CMakeProject::readPresets()
{
auto parsePreset = [](const Utils::FilePath &presetFile) -> Internal::PresetsData {
@@ -168,6 +207,7 @@ void CMakeProject::readPresets()
Internal::PresetsData cmakeUserPresetsData = parsePreset(cmakeUserPresetsJson);
m_presetsData = combinePresets(cmakePresetsData, cmakeUserPresetsData);
setupBuildPresets(m_presetsData);
}
bool CMakeProject::setupTarget(Target *t)