diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-02 13:47:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-02 13:47:32 (GMT) |
| commit | 0c7951a9397f4703d61d346c64c27a99a30f4dac (patch) | |
| tree | 2403d88c833898e8aeecfdc0413e2d8469038d2d | |
| parent | f1ff6301eafe61f5e9d7376d3713a0f37d3a2015 (diff) | |
| download | CMake-0c7951a9397f4703d61d346c64c27a99a30f4dac.zip CMake-0c7951a9397f4703d61d346c64c27a99a30f4dac.tar.gz CMake-0c7951a9397f4703d61d346c64c27a99a30f4dac.tar.bz2 | |
cmLocalGenerator: Consolidate conditions in AddArchitectureFlags
Make room for possible future non-Apple architecture flags.
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index e91eb46..b748b9c 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1475,11 +1475,7 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags, const std::string& config) { // Only add Mac OS X specific flags on Darwin platforms (OSX and iphone): - if (!this->Makefile->IsOn("APPLE")) { - return; - } - - if (this->EmitUniversalBinaryFlags) { + if (this->Makefile->IsOn("APPLE") && this->EmitUniversalBinaryFlags) { std::vector<std::string> archs; target->GetAppleArchs(config, archs); const char* sysroot = this->Makefile->GetDefinition("CMAKE_OSX_SYSROOT"); |