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

CMakePM: Filter out empty key configuration items

Browse Source 
There were cases when an empty "-D" CMake command line parameter would
be genered, resulting in a failed CMake project configuration.

Task-number: QTCREATORBUG-27256
Fixes: QTCREATORBUG-27237
Change-Id: Ic26c9dfe72db154cd76fdcc913eb7fe623b3123c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2022-03-29 15:46:28 +02:00
parent b4f2ac0dd4
commit a2a8f56b6e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -619,7 +619,7 @@ void CMakeBuildSettingsWidget::updateInitialCMakeArguments()
*it = ci; *it = ci;
if (ci.isUnset) if (ci.isUnset)
initialList.erase(it); initialList.erase(it);
} else { } else if (!ci.key.isEmpty()) {
initialList.push_back(ci); initialList.push_back(ci);
} }
} }

8
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -1122,8 +1122,12 @@ void CMakeConfigurationKitAspect::fromStringList(Kit *k, const QStringList &in)
QStringList CMakeConfigurationKitAspect::toArgumentsList(const Kit *k) QStringList CMakeConfigurationKitAspect::toArgumentsList(const Kit *k)
{ {
return Utils::transform(CMakeConfigurationKitAspect::configuration(k).toList(), QStringList current = Utils::transform(CMakeConfigurationKitAspect::configuration(k).toList(),
[](const CMakeConfigItem &i) { return i.toArgument(nullptr); }); [](const CMakeConfigItem &i) {
return i.toArgument(nullptr);
});
current = Utils::filtered(current, [](const QString &s) { return s != "-D" || s != "-U"; });
return current;
} }
CMakeConfig CMakeConfigurationKitAspect::defaultConfiguration(const Kit *k) CMakeConfig CMakeConfigurationKitAspect::defaultConfiguration(const Kit *k)