From 17100d4ca97893affe1ceff5782db52e3f67d518 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 15 Mar 2023 11:45:39 +0100 Subject: [PATCH] CMakePM: add ${pathSepList} from CMakePresets version 5 Task-number: QTCREATORBUG-24555 Change-Id: Ic0bf0d7029267c71352294de428921ff52fe4359 Reviewed-by: Alessandro Portale --- src/plugins/cmakeprojectmanager/presetsmacros.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/cmakeprojectmanager/presetsmacros.cpp b/src/plugins/cmakeprojectmanager/presetsmacros.cpp index 98399a78763..c1007b202f4 100644 --- a/src/plugins/cmakeprojectmanager/presetsmacros.cpp +++ b/src/plugins/cmakeprojectmanager/presetsmacros.cpp @@ -7,6 +7,7 @@ #include #include #include +#include namespace CMakeProjectManager::Internal::CMakePresets::Macros { @@ -43,6 +44,8 @@ static void expandAllButEnv(const PresetsDetails::ConfigurePreset &preset, value.replace("${generator}", preset.generator.value()); value.replace("${hostSystemName}", getHostSystemName(sourceDirectory.osType())); + value.replace("${pathListSep}", + Utils::OsSpecificAspects::pathListSeparator(sourceDirectory.osType())); } static void expandAllButEnv(const PresetsDetails::BuildPreset &preset, @@ -57,6 +60,8 @@ static void expandAllButEnv(const PresetsDetails::BuildPreset &preset, value.replace("${sourceDirName}", sourceDirectory.fileName()); value.replace("${presetName}", preset.name); + value.replace("${pathListSep}", + Utils::OsSpecificAspects::pathListSeparator(sourceDirectory.osType())); } static QString expandMacroEnv(const QString ¯oPrefix,