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

CMakePM: Add supprot for CMakePresets version 3

Browse Source 
This includes Condition and toolchainFile

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

Task-number: QTCREATORBUG-24555
Change-Id: I1026390af67b2be1aa0c3b02b654fc19442d3c89
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2022-09-26 18:59:04 +02:00
parent 45a275e054
commit ee4c998ff3
7 changed files with 430 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
src/plugins/cmakeprojectmanager/presetsmacros.cpp
View File

@@ -12,6 +12,25 @@
namespace CMakeProjectManager::Internal::CMakePresets::Macros {
QString getHostSystemName()
{
Utils::OsType osType = Utils::HostOsInfo::hostOs();
switch (osType) {
case Utils::OsTypeWindows:
return "Windows";
case Utils::OsTypeLinux:
return "Linux";
case Utils::OsTypeMac:
return "Darwin";
case Utils::OsTypeOtherUnix:
return "Unix";
case Utils::OsTypeOther:
return "Other";
}
return "Other";
}
void expandAllButEnv(const PresetsDetails::ConfigurePreset &preset,
const Utils::FilePath &sourceDirectory,
QString &value)
@@ -25,6 +44,8 @@ void expandAllButEnv(const PresetsDetails::ConfigurePreset &preset,
value.replace("${presetName}", preset.name);
if (preset.generator)
value.replace("${generator}", preset.generator.value());
value.replace("${hostSystemName}", getHostSystemName());
}
void expandAllButEnv(const PresetsDetails::BuildPreset &preset,
@@ -141,6 +162,106 @@ void expand(const PresetType &preset,
value.replace(match.captured(1), env.value(match.captured(2)));
}
void updateToolchainFile(
CMakeProjectManager::Internal::PresetsDetails::ConfigurePreset &configurePreset,
const Utils::Environment &env,
const Utils::FilePath &sourceDirectory,
const Utils::FilePath &buildDirectory)
{
if (!configurePreset.toolchainFile)
return;
QString toolchainFileName = configurePreset.toolchainFile.value();
CMakePresets::Macros::expand(configurePreset, env, sourceDirectory, toolchainFileName);
// Resolve the relative path first to source and afterwards to build directory
Utils::FilePath toolchainFile = Utils::FilePath::fromString(toolchainFileName);
if (toolchainFile.isRelativePath()) {
for (const auto &path : {sourceDirectory, buildDirectory}) {
Utils::FilePath probePath = toolchainFile.resolvePath(path);
if (probePath.exists() && probePath != path) {
toolchainFile = probePath;
break;
}
}
}
if (!toolchainFile.exists())
return;
// toolchainFile takes precedence to CMAKE_TOOLCHAIN_FILE
CMakeConfig cache = configurePreset.cacheVariables ? configurePreset.cacheVariables.value()
: CMakeConfig();
auto it = std::find_if(cache.begin(), cache.end(), [](const CMakeConfigItem &item) {
return item.key == "CMAKE_TOOLCHAIN_FILE";
});
if (it != cache.end())
it->value = toolchainFile.toString().toUtf8();
else
cache << CMakeConfigItem("CMAKE_TOOLCHAIN_FILE",
CMakeConfigItem::FILEPATH,
toolchainFile.toString().toUtf8());
configurePreset.cacheVariables = cache;
}
template<class PresetType>
void expandConditionValues(const PresetType &preset,
const Utils::Environment &env,
const Utils::FilePath &sourceDirectory,
PresetsDetails::Condition &condition)
{
if (condition.isEquals() || condition.isNotEquals()) {
if (condition.lhs)
expand(preset, env, sourceDirectory, condition.lhs.value());
if (condition.rhs)
expand(preset, env, sourceDirectory, condition.rhs.value());
}
if (condition.isInList() || condition.isNotInList()) {
if (condition.string)
expand(preset, env, sourceDirectory, condition.string.value());
if (condition.list)
for (QString &listValue : condition.list.value())
expand(preset, env, sourceDirectory, listValue);
}
if (condition.isMatches() || condition.isNotMatches()) {
if (condition.string)
expand(preset, env, sourceDirectory, condition.string.value());
if (condition.regex)
expand(preset, env, sourceDirectory, condition.regex.value());
}
if (condition.isAnyOf() || condition.isAllOf()) {
if (condition.conditions)
for (PresetsDetails::Condition::ConditionPtr &c : condition.conditions.value())
expandConditionValues(preset, env, sourceDirectory, *c);
}
if (condition.isNot()) {
if (condition.condition)
expandConditionValues(preset, env, sourceDirectory, *condition.condition.value());
}
}
template<class PresetType>
bool evaluatePresetCondition(const PresetType &preset, const Utils::FilePath &sourceDirectory)
{
if (!preset.condition)
return true;
Utils::Environment env = Utils::Environment::systemEnvironment();
expand(preset, env, sourceDirectory);
PresetsDetails::Condition condition = preset.condition.value();
expandConditionValues(preset, env, sourceDirectory, condition);
return condition.evaluate();
}
// Expand for PresetsDetails::ConfigurePreset
template void expand<PresetsDetails::ConfigurePreset>(const PresetsDetails::ConfigurePreset &preset,
Utils::Environment &env,
@@ -155,6 +276,9 @@ template void expand<PresetsDetails::ConfigurePreset>(const PresetsDetails::Conf
const Utils::FilePath &sourceDirectory,
QString &value);
template bool evaluatePresetCondition<PresetsDetails::ConfigurePreset>(
const PresetsDetails::ConfigurePreset &preset, const Utils::FilePath &sourceDirectory);
// Expand for PresetsDetails::BuildPreset
template void expand<PresetsDetails::BuildPreset>(const PresetsDetails::BuildPreset &preset,
Utils::Environment &env,
@@ -169,4 +293,7 @@ template void expand<PresetsDetails::BuildPreset>(const PresetsDetails::BuildPre
const Utils::FilePath &sourceDirectory,
QString &value);
template bool evaluatePresetCondition<PresetsDetails::BuildPreset>(
const PresetsDetails::BuildPreset &preset, const Utils::FilePath &sourceDirectory);
} // namespace CMakeProjectManager::Internal::CMakePresets::Macros