-fix GetFrameworkFlags() for Mac, which was broken with my last commit
Alex
This commit is contained in:
parent
0b7206dd23
commit
d7ceb75e8a
|
@ -1445,7 +1445,7 @@ std::string cmMakefileTargetGenerator::GetFrameworkFlags()
|
||||||
std::set<cmStdString> emitted;
|
std::set<cmStdString> emitted;
|
||||||
#ifdef __APPLE__ /* don't insert this when crosscompiling e.g. to iphone */
|
#ifdef __APPLE__ /* don't insert this when crosscompiling e.g. to iphone */
|
||||||
emitted.insert("/System/Library/Frameworks");
|
emitted.insert("/System/Library/Frameworks");
|
||||||
#else
|
#endif
|
||||||
std::vector<std::string> includes;
|
std::vector<std::string> includes;
|
||||||
this->LocalGenerator->GetIncludeDirectories(includes);
|
this->LocalGenerator->GetIncludeDirectories(includes);
|
||||||
std::vector<std::string>::iterator i;
|
std::vector<std::string>::iterator i;
|
||||||
|
@ -1477,7 +1477,6 @@ std::string cmMakefileTargetGenerator::GetFrameworkFlags()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return flags;
|
return flags;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue