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

CMakePM: add ${pathSepList} from CMakePresets version 5

Browse Source 
Task-number: QTCREATORBUG-24555
Change-Id: Ic0bf0d7029267c71352294de428921ff52fe4359
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2023-03-15 11:45:39 +01:00
parent b0605f1095
commit 17100d4ca9
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@
#include <utils/environment.h>
#include <utils/filepath.h>
#include <utils/hostosinfo.h>
#include <utils/osspecificaspects.h>
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 &macroPrefix,