diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-03 14:45:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-03 14:45:59 (GMT) |
| commit | 0663dbf1331fb848cf0c274e232d0a19d966158c (patch) | |
| tree | d98cf589f4fcb7d546cd843ec33f6e0026839cb5 /Source | |
| parent | 9d16f64048ccaf228c135fe1236cb9eee56c50f3 (diff) | |
| parent | f6c21894952fb07e50e511efaa3baded794d631f (diff) | |
| download | CMake-0663dbf1331fb848cf0c274e232d0a19d966158c.zip CMake-0663dbf1331fb848cf0c274e232d0a19d966158c.tar.gz CMake-0663dbf1331fb848cf0c274e232d0a19d966158c.tar.bz2 | |
Merge topic 'minor-cleanups'
f6c21894 Modules: Rename internal platform-specific compiler determination modules
0c7951a9 cmLocalGenerator: Consolidate conditions in AddArchitectureFlags
Diffstat (limited to 'Source')
| -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"); |