mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 13:50:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmInstallCommand: Use cm::optional for keyword argument presence

Browse Source
This commit is contained in:
Brad King
2022-06-29 15:52:36 -04:00
parent 298f226cb4
commit 5446b15c5c
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmInstallCommand.cxx
+9 -10
View File
@@ -12,6 +12,7 @@
#include <utility> #include <utility>
#include <cm/memory> #include <cm/memory>
#include <cm/optional>
#include <cm/string_view> #include <cm/string_view>
#include <cmext/string_view> #include <cmext/string_view>
@@ -436,24 +437,22 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
// These generic args also contain the targets and the export stuff // These generic args also contain the targets and the export stuff
std::vector<std::string> targetList; std::vector<std::string> targetList;
std::string exports; std::string exports;
std::vector<std::string> runtimeDependenciesArgVector; cm::optional<std::vector<std::string>> runtimeDependenciesArgVector;
std::string runtimeDependencySetArg; std::string runtimeDependencySetArg;
std::vector<std::string> unknownArgs; std::vector<std::string> unknownArgs;
std::vector<cm::string_view> parsedArgs;
cmInstallCommandArguments genericArgs(helper.DefaultComponentName); cmInstallCommandArguments genericArgs(helper.DefaultComponentName);
genericArgs.Bind("TARGETS"_s, targetList); genericArgs.Bind("TARGETS"_s, targetList);
genericArgs.Bind("EXPORT"_s, exports); genericArgs.Bind("EXPORT"_s, exports);
genericArgs.Bind("RUNTIME_DEPENDENCIES"_s, runtimeDependenciesArgVector); genericArgs.Bind("RUNTIME_DEPENDENCIES"_s, runtimeDependenciesArgVector);
genericArgs.Bind("RUNTIME_DEPENDENCY_SET"_s, runtimeDependencySetArg); genericArgs.Bind("RUNTIME_DEPENDENCY_SET"_s, runtimeDependencySetArg);
genericArgs.Parse(genericArgVector, &unknownArgs, nullptr, &parsedArgs); genericArgs.Parse(genericArgVector, &unknownArgs);
bool success = genericArgs.Finalize(); bool success = genericArgs.Finalize();
bool withRuntimeDependencies =
std::find(parsedArgs.begin(), parsedArgs.end(), "RUNTIME_DEPENDENCIES") !=
parsedArgs.end();
RuntimeDependenciesArgs runtimeDependenciesArgs = RuntimeDependenciesArgs runtimeDependenciesArgs =
RuntimeDependenciesArgHelper.Parse(runtimeDependenciesArgVector, runtimeDependenciesArgVector
&unknownArgs); ? RuntimeDependenciesArgHelper.Parse(*runtimeDependenciesArgVector,
&unknownArgs)
: RuntimeDependenciesArgs();
cmInstallCommandArguments archiveArgs(helper.DefaultComponentName); cmInstallCommandArguments archiveArgs(helper.DefaultComponentName);
cmInstallCommandArguments libraryArgs(helper.DefaultComponentName); cmInstallCommandArguments libraryArgs(helper.DefaultComponentName);
@@ -597,7 +596,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
} }
cmInstallRuntimeDependencySet* runtimeDependencySet = nullptr; cmInstallRuntimeDependencySet* runtimeDependencySet = nullptr;
if (withRuntimeDependencies) { if (runtimeDependenciesArgVector) {
if (!runtimeDependencySetArg.empty()) { if (!runtimeDependencySetArg.empty()) {
status.SetError("TARGETS cannot have both RUNTIME_DEPENDENCIES and " status.SetError("TARGETS cannot have both RUNTIME_DEPENDENCIES and "
"RUNTIME_DEPENDENCY_SET."); "RUNTIME_DEPENDENCY_SET.");
@@ -1137,7 +1136,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
} }
} }
if (withRuntimeDependencies && !runtimeDependencySet->Empty()) { if (runtimeDependenciesArgVector && !runtimeDependencySet->Empty()) {
AddInstallRuntimeDependenciesGenerator( AddInstallRuntimeDependenciesGenerator(
helper, runtimeDependencySet, runtimeArgs, libraryArgs, frameworkArgs, helper, runtimeDependencySet, runtimeArgs, libraryArgs, frameworkArgs,
std::move(runtimeDependenciesArgs), installsRuntime, installsLibrary, std::move(runtimeDependenciesArgs), installsRuntime, installsLibrary,