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

CMakePM: Do not have special treatment for PATH in CMake Presets

Browse Source 
Fixes: QTCREATORBUG-31439
Change-Id: I23b6616adc8fd6bfddd0bbd536d6a15b23fa0996
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Cristian Adam
2024-08-14 19:00:27 +02:00
parent d0a06748a8
commit 5d8a8982a1
1 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,6 +130,7 @@ template<class PresetType>
void expand(const PresetType &preset, Environment &env, const FilePath &sourceDirectory) void expand(const PresetType &preset, Environment &env, const FilePath &sourceDirectory)
{ {
const Environment presetEnv = getEnvCombined(preset.environment, env); const Environment presetEnv = getEnvCombined(preset.environment, env);
const Environment parentEnv = env;
presetEnv.forEachEntry([&](const QString &key, const QString &value_, bool enabled) { presetEnv.forEachEntry([&](const QString &key, const QString &value_, bool enabled) {
if (!enabled) if (!enabled)
return; return;
@@ -139,34 +140,14 @@ void expand(const PresetType &preset, Environment &env, const FilePath &sourceDi
return presetEnv.value(macroName); return presetEnv.value(macroName);
}); });
enum Operation { set, appendOrSet, prependOrSet }; value = expandMacroEnv("penv", value, [parentEnv](const QString &macroName) {
Operation op = set; return parentEnv.value(macroName);
if (key.compare("PATH", Qt::CaseInsensitive) == 0) {
op = appendOrSet;
const int index = value.indexOf("$penv{PATH}", 0, Qt::CaseInsensitive);
if (index != 0)
op = prependOrSet;
value.replace("$penv{PATH}", "", Qt::CaseInsensitive);
}
value = expandMacroEnv("penv", value, [env](const QString &macroName) {
return env.value(macroName);
}); });
// Make sure to expand the CMake macros also for environment variables // Make sure to expand the CMake macros also for environment variables
expandAllButEnv(preset, sourceDirectory, value); expandAllButEnv(preset, sourceDirectory, value);
switch (op) { env.set(key, value);
case set:
env.set(key, value);
break;
case appendOrSet:
env.appendOrSet(key, value);
break;
case prependOrSet:
env.prependOrSet(key, value);
break;
}
}); });
} }
@@ -185,15 +166,6 @@ void expand(const PresetType &preset, EnvironmentItems &envItems, const FilePath
return QString("${%1}").arg(macroName); return QString("${%1}").arg(macroName);
}); });
auto operation = EnvironmentItem::Operation::SetEnabled;
if (key.compare("PATH", Qt::CaseInsensitive) == 0) {
operation = EnvironmentItem::Operation::Append;
const int index = value.indexOf("$penv{PATH}", 0, Qt::CaseInsensitive);
if (index != 0)
operation = EnvironmentItem::Operation::Prepend;
value.replace("$penv{PATH}", "", Qt::CaseInsensitive);
}
value = expandMacroEnv("penv", value, [](const QString &macroName) { value = expandMacroEnv("penv", value, [](const QString &macroName) {
return QString("${%1}").arg(macroName); return QString("${%1}").arg(macroName);
}); });
@@ -201,7 +173,7 @@ void expand(const PresetType &preset, EnvironmentItems &envItems, const FilePath
// Make sure to expand the CMake macros also for environment variables // Make sure to expand the CMake macros also for environment variables
expandAllButEnv(preset, sourceDirectory, value); expandAllButEnv(preset, sourceDirectory, value);
envItems.emplace_back(Utils::EnvironmentItem(key, value, operation)); envItems.emplace_back(Utils::EnvironmentItem(key, value));
}); });
} }