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

CMakePM: Rename "Additional CMake parameters" to "... options"

Browse Source 
CMake documentation calls them Options, and we should use the same
terminology.

See https://cmake.org/cmake/help/v3.22/manual/cmake.1.html?#options

Change-Id: Ibb8ed9dd5a830290770a7fa89e7e5e1ce2d8c74a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2022-02-03 11:24:56 +01:00
parent 633a9a04e2
commit 8d12fd07e2
6 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,7 +345,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
cmakeConfiguration, cmakeConfiguration,
Row { Row {
bc->aspect<InitialCMakeArgumentsAspect>(), bc->aspect<InitialCMakeArgumentsAspect>(),
bc->aspect<AdditionalCMakeArgumentsAspect>() bc->aspect<AdditionalCMakeOptionsAspect>()
}, },
m_reconfigureButton, m_reconfigureButton,
} }
@@ -533,9 +533,9 @@ void CMakeBuildSettingsWidget::batchEditConfiguration()
return expander->expand(s); return expander->expand(s);
}); });
const bool isInitial = isInitialConfiguration(); const bool isInitial = isInitialConfiguration();
QStringList unknownArguments; QStringList unknownOptions;
CMakeConfig config = CMakeConfig::fromArguments(isInitial ? lines : expandedLines, CMakeConfig config = CMakeConfig::fromArguments(isInitial ? lines : expandedLines,
unknownArguments); unknownOptions);
for (auto &ci : config) for (auto &ci : config)
ci.isInitial = isInitial; ci.isInitial = isInitial;
@@ -698,10 +698,10 @@ void CMakeBuildSettingsWidget::updateButtonState()
m_resetButton->setEnabled(m_configModel->hasChanges(isInitial) && !isParsing); m_resetButton->setEnabled(m_configModel->hasChanges(isInitial) && !isParsing);
m_buildConfiguration->aspect<InitialCMakeArgumentsAspect>()->setVisible(isInitialConfiguration()); m_buildConfiguration->aspect<InitialCMakeArgumentsAspect>()->setVisible(isInitialConfiguration());
m_buildConfiguration->aspect<AdditionalCMakeArgumentsAspect>()->setVisible(!isInitialConfiguration()); m_buildConfiguration->aspect<AdditionalCMakeOptionsAspect>()->setVisible(!isInitialConfiguration());
m_buildConfiguration->aspect<InitialCMakeArgumentsAspect>()->setEnabled(!isParsing); m_buildConfiguration->aspect<InitialCMakeArgumentsAspect>()->setEnabled(!isParsing);
m_buildConfiguration->aspect<AdditionalCMakeArgumentsAspect>()->setEnabled(!isParsing); m_buildConfiguration->aspect<AdditionalCMakeOptionsAspect>()->setEnabled(!isParsing);
// Update label and text boldness of the reconfigure button // Update label and text boldness of the reconfigure button
QFont reconfigureButtonFont = m_reconfigureButton->font(); QFont reconfigureButtonFont = m_reconfigureButton->font();
@@ -1092,7 +1092,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
auto initialCMakeArgumentsAspect = addAspect<InitialCMakeArgumentsAspect>(); auto initialCMakeArgumentsAspect = addAspect<InitialCMakeArgumentsAspect>();
initialCMakeArgumentsAspect->setMacroExpanderProvider([this] { return macroExpander(); }); initialCMakeArgumentsAspect->setMacroExpanderProvider([this] { return macroExpander(); });
auto additionalCMakeArgumentsAspect = addAspect<AdditionalCMakeArgumentsAspect>(); auto additionalCMakeArgumentsAspect = addAspect<AdditionalCMakeOptionsAspect>();
additionalCMakeArgumentsAspect->setMacroExpanderProvider([this] { return macroExpander(); }); additionalCMakeArgumentsAspect->setMacroExpanderProvider([this] { return macroExpander(); });
macroExpander()->registerVariable(DEVELOPMENT_TEAM_FLAG, macroExpander()->registerVariable(DEVELOPMENT_TEAM_FLAG,
@@ -1392,7 +1392,7 @@ void CMakeBuildConfiguration::setInitialCMakeArguments(const QStringList &args)
QStringList CMakeBuildConfiguration::additionalCMakeArguments() const QStringList CMakeBuildConfiguration::additionalCMakeArguments() const
{ {
return ProcessArgs::splitArgs(aspect<AdditionalCMakeArgumentsAspect>()->value()); return ProcessArgs::splitArgs(aspect<AdditionalCMakeOptionsAspect>()->value());
} }
void CMakeBuildConfiguration::setAdditionalCMakeArguments(const QStringList &args) void CMakeBuildConfiguration::setAdditionalCMakeArguments(const QStringList &args)
@@ -1404,7 +1404,7 @@ void CMakeBuildConfiguration::setAdditionalCMakeArguments(const QStringList &arg
[](const QString &s) { [](const QString &s) {
return !s.isEmpty(); return !s.isEmpty();
}); });
aspect<AdditionalCMakeArgumentsAspect>()->setValue( aspect<AdditionalCMakeOptionsAspect>()->setValue(
ProcessArgs::joinArgs(nonEmptyAdditionalArguments)); ProcessArgs::joinArgs(nonEmptyAdditionalArguments));
} }
@@ -1413,13 +1413,13 @@ void CMakeBuildConfiguration::filterConfigArgumentsFromAdditionalCMakeArguments(
// On iOS the %{Ios:DevelopmentTeam:Flag} evalues to something like // On iOS the %{Ios:DevelopmentTeam:Flag} evalues to something like
// -DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM:STRING=MAGICSTRING // -DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM:STRING=MAGICSTRING
// which is already part of the CMake variables and should not be also // which is already part of the CMake variables and should not be also
// in the addtional CMake parameters // in the addtional CMake options
const QStringList arguments = ProcessArgs::splitArgs( const QStringList arguments = ProcessArgs::splitArgs(
aspect<AdditionalCMakeArgumentsAspect>()->value()); aspect<AdditionalCMakeOptionsAspect>()->value());
QStringList unknownArguments; QStringList unknownOptions;
const CMakeConfig config = CMakeConfig::fromArguments(arguments, unknownArguments); const CMakeConfig config = CMakeConfig::fromArguments(arguments, unknownOptions);
aspect<AdditionalCMakeArgumentsAspect>()->setValue(ProcessArgs::joinArgs(unknownArguments)); aspect<AdditionalCMakeOptionsAspect>()->setValue(ProcessArgs::joinArgs(unknownOptions));
} }
void CMakeBuildConfiguration::setError(const QString &message) void CMakeBuildConfiguration::setError(const QString &message)
@@ -1675,7 +1675,7 @@ const QStringList InitialCMakeArgumentsAspect::allValues() const
return initialCMakeArguments; return initialCMakeArguments;
} }
void InitialCMakeArgumentsAspect::setAllValues(const QString &values, QStringList &additionalArguments) void InitialCMakeArgumentsAspect::setAllValues(const QString &values, QStringList &additionalOptions)
{ {
QStringList arguments = values.split('\n', Qt::SkipEmptyParts); QStringList arguments = values.split('\n', Qt::SkipEmptyParts);
for (QString &arg: arguments) { for (QString &arg: arguments) {
@@ -1686,13 +1686,13 @@ void InitialCMakeArgumentsAspect::setAllValues(const QString &values, QStringLis
if (arg.startsWith("-T")) if (arg.startsWith("-T"))
arg.replace("-T", "-DCMAKE_GENERATOR_TOOLSET:STRING="); arg.replace("-T", "-DCMAKE_GENERATOR_TOOLSET:STRING=");
} }
m_cmakeConfiguration = CMakeConfig::fromArguments(arguments, additionalArguments); m_cmakeConfiguration = CMakeConfig::fromArguments(arguments, additionalOptions);
for (CMakeConfigItem &ci : m_cmakeConfiguration) for (CMakeConfigItem &ci : m_cmakeConfiguration)
ci.isInitial = true; ci.isInitial = true;
// Display the unknown arguments in "Additional CMake parameters" // Display the unknown arguments in "Additional CMake Options"
const QString additionalArgumentsValue = ProcessArgs::joinArgs(additionalArguments); const QString additionalOptionsValue = ProcessArgs::joinArgs(additionalOptions);
BaseAspect::setValueQuietly(additionalArgumentsValue); BaseAspect::setValueQuietly(additionalOptionsValue);
} }
void InitialCMakeArgumentsAspect::setCMakeConfiguration(const CMakeConfig &config) void InitialCMakeArgumentsAspect::setCMakeConfiguration(const CMakeConfig &config)
@@ -1717,18 +1717,18 @@ void InitialCMakeArgumentsAspect::toMap(QVariantMap &map) const
InitialCMakeArgumentsAspect::InitialCMakeArgumentsAspect() InitialCMakeArgumentsAspect::InitialCMakeArgumentsAspect()
{ {
setSettingsKey("CMake.Initial.Parameters"); setSettingsKey("CMake.Initial.Parameters");
setLabelText(tr("Additional CMake parameters:")); setLabelText(tr("Additional CMake options:"));
setDisplayStyle(LineEditDisplay); setDisplayStyle(LineEditDisplay);
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// - AdditionalCMakeParametersAspect: // - AdditionalCMakeOptionsAspect:
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
AdditionalCMakeArgumentsAspect::AdditionalCMakeArgumentsAspect() AdditionalCMakeOptionsAspect::AdditionalCMakeOptionsAspect()
{ {
setSettingsKey("CMake.Additional.Parameters"); setSettingsKey("CMake.Additional.Options");
setLabelText(tr("Additional CMake parameters:")); setLabelText(tr("Additional CMake options:"));
setDisplayStyle(LineEditDisplay); setDisplayStyle(LineEditDisplay);
} }

4
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
View File

@@ -164,12 +164,12 @@ public:
void toMap(QVariantMap &map) const final; void toMap(QVariantMap &map) const final;
}; };
class AdditionalCMakeArgumentsAspect final : public Utils::StringAspect class AdditionalCMakeOptionsAspect final : public Utils::StringAspect
{ {
Q_OBJECT Q_OBJECT
public: public:
AdditionalCMakeArgumentsAspect(); AdditionalCMakeOptionsAspect();
}; };
class SourceDirectoryAspect final : public Utils::StringAspect class SourceDirectoryAspect final : public Utils::StringAspect

4
src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp
View File

@@ -310,7 +310,7 @@ static CMakeConfigItem unsetItemFromString(const QString &input)
return item; return item;
} }
CMakeConfig CMakeConfig::fromArguments(const QStringList &list, QStringList &unknownArguments) CMakeConfig CMakeConfig::fromArguments(const QStringList &list, QStringList &unknownOptions)
{ {
CMakeConfig result; CMakeConfig result;
bool inSet = false; bool inSet = false;
@@ -343,7 +343,7 @@ CMakeConfig CMakeConfig::fromArguments(const QStringList &list, QStringList &unk
continue; continue;
} }
unknownArguments.append(i); unknownOptions.append(i);
} }
return result; return result;
} }

2
src/plugins/cmakeprojectmanager/cmakeconfigitem.h
View File

@@ -91,7 +91,7 @@ public:
const QList<CMakeConfigItem> &toList() const { return *this; } const QList<CMakeConfigItem> &toList() const { return *this; }
static CMakeConfig fromArguments(const QStringList &list, QStringList &unknownArguments); static CMakeConfig fromArguments(const QStringList &list, QStringList &unknownOptions);
static CMakeConfig fromFile(const Utils::FilePath &input, QString *errorMessage); static CMakeConfig fromFile(const Utils::FilePath &input, QString *errorMessage);
QByteArray valueOf(const QByteArray &key) const; QByteArray valueOf(const QByteArray &key) const;

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

@@ -942,7 +942,7 @@ private:
m_additionalEditor = new QLineEdit; m_additionalEditor = new QLineEdit;
auto additionalLabel = new QLabel(m_dialog); auto additionalLabel = new QLabel(m_dialog);
additionalLabel->setText(tr("Additional CMake parameters: ")); additionalLabel->setText(tr("Additional CMake options: "));
auto additionalChooser = new VariableChooser(m_dialog); auto additionalChooser = new VariableChooser(m_dialog);
additionalChooser->addSupportedWidget(m_additionalEditor); additionalChooser->addSupportedWidget(m_additionalEditor);
@@ -984,16 +984,16 @@ private:
QTC_ASSERT(m_editor, return); QTC_ASSERT(m_editor, return);
KitGuard guard(kit()); KitGuard guard(kit());
QStringList unknownArguments; QStringList unknownOptions;
const CMakeConfig config = CMakeConfig::fromArguments(m_editor->toPlainText().split('\n'), const CMakeConfig config = CMakeConfig::fromArguments(m_editor->toPlainText().split('\n'),
unknownArguments); unknownOptions);
CMakeConfigurationKitAspect::setConfiguration(kit(), config); CMakeConfigurationKitAspect::setConfiguration(kit(), config);
QString additionalConfiguration = m_additionalEditor->text(); QString additionalConfiguration = m_additionalEditor->text();
if (!unknownArguments.isEmpty()) { if (!unknownOptions.isEmpty()) {
if (!additionalConfiguration.isEmpty()) if (!additionalConfiguration.isEmpty())
additionalConfiguration += " "; additionalConfiguration += " ";
additionalConfiguration += ProcessArgs::joinArgs(unknownArguments); additionalConfiguration += ProcessArgs::joinArgs(unknownOptions);
} }
CMakeConfigurationKitAspect::setAdditionalConfiguration(kit(), additionalConfiguration); CMakeConfigurationKitAspect::setAdditionalConfiguration(kit(), additionalConfiguration);
} }

4
src/plugins/cmakeprojectmanager/fileapireader.cpp
View File

@@ -325,10 +325,10 @@ void FileApiReader::writeConfigurationIntoBuildDirectory(const QStringList &conf
QTC_CHECK(buildDir.ensureWritableDir()); QTC_CHECK(buildDir.ensureWritableDir());
QByteArray contents; QByteArray contents;
QStringList unknownArguments; QStringList unknownOptions;
contents.append("# This file is managed by Qt Creator, do not edit!\n\n"); contents.append("# This file is managed by Qt Creator, do not edit!\n\n");
contents.append( contents.append(
transform(CMakeConfig::fromArguments(configurationArguments, unknownArguments).toList(), transform(CMakeConfig::fromArguments(configurationArguments, unknownOptions).toList(),
[](const CMakeConfigItem &item) { return item.toCMakeSetLine(nullptr); }) [](const CMakeConfigItem &item) { return item.toCMakeSetLine(nullptr); })
.join('\n') .join('\n')
.toUtf8()); .toUtf8());