kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmComputeLinkInformation: Port to cmOutputConverter.

This commit is contained in:
Stephen Kelly 2015-06-04 19:43:09 +02:00
parent 8680520fea
commit 4d8b79ad7e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmComputeLinkInformation.cxx
View File

@ -16,7 +16,7 @@
#include "cmGlobalGenerator.h" #include "cmGlobalGenerator.h"
#include "cmState.h" #include "cmState.h"
#include "cmLocalGenerator.h" #include "cmOutputConverter.h"
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmTarget.h" #include "cmTarget.h"
#include "cmake.h" #include "cmake.h"
@ -246,7 +246,6 @@ cmComputeLinkInformation
// Store context information. // Store context information.
this->Target = target; this->Target = target;
this->Makefile = this->Target->GetMakefile(); this->Makefile = this->Target->GetMakefile();
this->LocalGenerator = this->Makefile->GetLocalGenerator();
this->GlobalGenerator = this->Makefile->GetGlobalGenerator(); this->GlobalGenerator = this->Makefile->GetGlobalGenerator();
this->CMakeInstance = this->GlobalGenerator->GetCMakeInstance(); this->CMakeInstance = this->GlobalGenerator->GetCMakeInstance();
@ -1395,7 +1394,8 @@ void cmComputeLinkInformation::AddFrameworkItem(std::string const& item)
// Add the item using the -framework option. // Add the item using the -framework option.
this->Items.push_back(Item("-framework", false)); this->Items.push_back(Item("-framework", false));
fw = this->LocalGenerator->EscapeForShell(fw); cmOutputConverter converter(this->Makefile->GetStateSnapshot());
fw = converter.EscapeForShell(fw);
this->Items.push_back(Item(fw, false)); this->Items.push_back(Item(fw, false));
} }

2
Source/cmComputeLinkInformation.h
View File

@ -18,7 +18,6 @@
class cmake; class cmake;
class cmGlobalGenerator; class cmGlobalGenerator;
class cmLocalGenerator;
class cmMakefile; class cmMakefile;
class cmTarget; class cmTarget;
class cmOrderDirectories; class cmOrderDirectories;
@ -75,7 +74,6 @@ private:
// Context information. // Context information.
cmTarget const* Target; cmTarget const* Target;
cmMakefile* Makefile; cmMakefile* Makefile;
cmLocalGenerator* LocalGenerator;
cmGlobalGenerator* GlobalGenerator; cmGlobalGenerator* GlobalGenerator;
cmake* CMakeInstance; cmake* CMakeInstance;