ENH: fix for bug 3067 the first framework ate the rest of the libraries
This commit is contained in:
parent
ae10b3578d
commit
5ebe1f573f
|
@ -258,11 +258,11 @@ bool cmOrderLinkDirectories::DetermineLibraryPathOrder()
|
||||||
cmStdString dir;
|
cmStdString dir;
|
||||||
cmStdString file;
|
cmStdString file;
|
||||||
std::vector<cmStdString> empty;
|
std::vector<cmStdString> empty;
|
||||||
bool framework = false;
|
|
||||||
// do not add a -F for the system frameworks
|
// do not add a -F for the system frameworks
|
||||||
this->EmittedFrameworkPaths.insert("/System/Library/Frameworks");
|
this->EmittedFrameworkPaths.insert("/System/Library/Frameworks");
|
||||||
for(unsigned int i=0; i < this->RawLinkItems.size(); ++i)
|
for(unsigned int i=0; i < this->RawLinkItems.size(); ++i)
|
||||||
{
|
{
|
||||||
|
bool framework = false;
|
||||||
if(cmSystemTools::FileIsFullPath(this->RawLinkItems[i].c_str()))
|
if(cmSystemTools::FileIsFullPath(this->RawLinkItems[i].c_str()))
|
||||||
{
|
{
|
||||||
if(cmSystemTools::FileIsDirectory(this->RawLinkItems[i].c_str()))
|
if(cmSystemTools::FileIsDirectory(this->RawLinkItems[i].c_str()))
|
||||||
|
|
Loading…
Reference in New Issue