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

CMakePM: configure presets review fixes

Browse Source 
Amends 2ab1e76ca9

Change-Id: Id10f0d4da6a60223d68af3cea6c5263f7c8c62f2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Cristian Adam
2022-09-21 12:50:27 +02:00
parent 42f8e42927
commit 5a156395c4
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,10 +124,9 @@ QStringList CMakeProjectImporter::importCandidates()
if (configPreset.hidden.value()) if (configPreset.hidden.value())
continue; continue;
const QString presetDirName = m_presetsTempDir.filePath(configPreset.name).toString(); const FilePath configPresetDir = m_presetsTempDir.filePath(configPreset.name);
const QDir presetDir; configPresetDir.createDir();
presetDir.mkpath(presetDirName); candidates << configPresetDir.toString();
candidates << presetDirName;
} }
const QStringList finalists = Utils::filteredUnique(candidates); const QStringList finalists = Utils::filteredUnique(candidates);
@@ -138,16 +137,11 @@ QStringList CMakeProjectImporter::importCandidates()
static CMakeConfig configurationFromPresetProbe( static CMakeConfig configurationFromPresetProbe(
const FilePath &importPath, const PresetsDetails::ConfigurePreset &configurePreset) const FilePath &importPath, const PresetsDetails::ConfigurePreset &configurePreset)
{ {
QFile cmakeListTxt(importPath.pathAppended("CMakeLists.txt").toString()); const FilePath cmakeListTxt = importPath / "CMakeLists.txt";
if (!cmakeListTxt.open(QIODevice::WriteOnly)) { cmakeListTxt.writeFileContents(QByteArray("cmake_minimum_required(VERSION 3.15)\n"
return {};
}
cmakeListTxt.write(QByteArray("cmake_minimum_required(VERSION 3.15)\n"
"\n" "\n"
"project(preset-probe)\n" "project(preset-probe)\n"
"\n")); "\n"));
cmakeListTxt.close();
QtcProcess cmake; QtcProcess cmake;
cmake.setTimeoutS(30); cmake.setTimeoutS(30);