diff options
author | Regina Pfeifer <regina@mailbox.org> | 2019-09-12 08:21:36 (GMT) |
---|---|---|
committer | Regina Pfeifer <regina@mailbox.org> | 2019-09-12 16:16:17 (GMT) |
commit | 83b3f76a3b13ffe2d8bdf3f67c20e36e22a6955f (patch) | |
tree | ad121deb1cbca5cf373bb0ed895198e1cdc7e5cd /Source/cmLinkLibrariesCommand.cxx | |
parent | b85407ae76951649907e8e5675fe17d65dfd5457 (diff) | |
download | CMake-83b3f76a3b13ffe2d8bdf3f67c20e36e22a6955f.zip CMake-83b3f76a3b13ffe2d8bdf3f67c20e36e22a6955f.tar.gz CMake-83b3f76a3b13ffe2d8bdf3f67c20e36e22a6955f.tar.bz2 |
cmLinkLibrariesCommand: Port away from cmCommand
Ref: #19499
Diffstat (limited to 'Source/cmLinkLibrariesCommand.cxx')
-rw-r--r-- | Source/cmLinkLibrariesCommand.cxx | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/Source/cmLinkLibrariesCommand.cxx b/Source/cmLinkLibrariesCommand.cxx index bf05310..cb63ceb 100644 --- a/Source/cmLinkLibrariesCommand.cxx +++ b/Source/cmLinkLibrariesCommand.cxx @@ -2,38 +2,37 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLinkLibrariesCommand.h" +#include "cmExecutionStatus.h" #include "cmMakefile.h" -class cmExecutionStatus; - -// cmLinkLibrariesCommand -bool cmLinkLibrariesCommand::InitialPass(std::vector<std::string> const& args, - cmExecutionStatus&) +bool cmLinkLibrariesCommand(std::vector<std::string> const& args, + cmExecutionStatus& status) { if (args.empty()) { return true; } + cmMakefile& mf = status.GetMakefile(); // add libraries, note that there is an optional prefix // of debug and optimized than can be used for (auto i = args.begin(); i != args.end(); ++i) { if (*i == "debug") { ++i; if (i == args.end()) { - this->SetError("The \"debug\" argument must be followed by " - "a library"); + status.SetError("The \"debug\" argument must be followed by " + "a library"); return false; } - this->Makefile->AppendProperty("LINK_LIBRARIES", "debug"); + mf.AppendProperty("LINK_LIBRARIES", "debug"); } else if (*i == "optimized") { ++i; if (i == args.end()) { - this->SetError("The \"optimized\" argument must be followed by " - "a library"); + status.SetError("The \"optimized\" argument must be followed by " + "a library"); return false; } - this->Makefile->AppendProperty("LINK_LIBRARIES", "optimized"); + mf.AppendProperty("LINK_LIBRARIES", "optimized"); } - this->Makefile->AppendProperty("LINK_LIBRARIES", i->c_str()); + mf.AppendProperty("LINK_LIBRARIES", i->c_str()); } return true; |