|  | @@ -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;
 |