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

CMakePM: Allow preset name changing for Reload CMake Presets

Browse Source 
Fixes: QTCREATORBUG-30237
Change-Id: I9d2f90d9637b91845dfe0ab619c83ff60dbd986a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2024-01-29 23:02:15 +01:00
parent 85f7917911
commit f00513835b
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
View File

@@ -138,6 +138,11 @@ static QString fileNameToPresetName(const QString &fileName)
return name; return name;
} }
static QString displayPresetName(const QString &presetName)
{
return QString("%1 (CMake preset)").arg(presetName);
}
FilePaths CMakeProjectImporter::importCandidates() FilePaths CMakeProjectImporter::importCandidates()
{ {
FilePaths candidates; FilePaths candidates;
@@ -966,6 +971,9 @@ bool CMakeProjectImporter::matchKit(void *directoryData, const Kit *k) const
if (data->cmakePreset != presetName) if (data->cmakePreset != presetName)
return false; return false;
if (!k->unexpandedDisplayName().contains(displayPresetName(data->cmakePresetDisplayname)))
return false;
ensureBuildDirectory(*data, k); ensureBuildDirectory(*data, k);
haveCMakePreset = true; haveCMakePreset = true;
} }
@@ -1008,8 +1016,7 @@ Kit *CMakeProjectImporter::createKit(void *directoryData) const
} }
if (!data->cmakePresetDisplayname.isEmpty()) { if (!data->cmakePresetDisplayname.isEmpty()) {
k->setUnexpandedDisplayName( k->setUnexpandedDisplayName(displayPresetName(data->cmakePresetDisplayname));
QString("%1 (CMake preset)").arg(data->cmakePresetDisplayname));
CMakeConfigurationKitAspect::setCMakePreset(k, data->cmakePreset); CMakeConfigurationKitAspect::setCMakePreset(k, data->cmakePreset);
} }