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

cmLocalGenerator: Consolidate conditions in AddArchitectureFlags 

Make room for possible future non-Apple architecture flags.
This commit is contained in:
Brad King 2016-06-02 09:47:29 -04:00
parent f1ff6301ea
commit 0c7951a939
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalGenerator.cxx
View File

@ -1475,11 +1475,7 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags,
const std::string& config) const std::string& config)
{ {
// Only add Mac OS X specific flags on Darwin platforms (OSX and iphone): // Only add Mac OS X specific flags on Darwin platforms (OSX and iphone):
if (!this->Makefile->IsOn("APPLE")) { if (this->Makefile->IsOn("APPLE") && this->EmitUniversalBinaryFlags) {
return;
}
if (this->EmitUniversalBinaryFlags) {
std::vector<std::string> archs; std::vector<std::string> archs;
target->GetAppleArchs(config, archs); target->GetAppleArchs(config, archs);
const char* sysroot = this->Makefile->GetDefinition("CMAKE_OSX_SYSROOT"); const char* sysroot = this->Makefile->GetDefinition("CMAKE_OSX_SYSROOT");