diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-11 12:54:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-11 12:54:15 (GMT) |
| commit | 5c9edd38c6808592dc39d17a17ce74c2d7218eb4 (patch) | |
| tree | 585ed1e3a826db64fa8d9ce7fc2010ee6f40b223 | |
| parent | e524819483cc896745682769c781099c214149bc (diff) | |
| parent | 70ce1ad64a04a244bb1c03753da0752c61fc3a37 (diff) | |
| download | CMake-5c9edd38c6808592dc39d17a17ce74c2d7218eb4.zip CMake-5c9edd38c6808592dc39d17a17ce74c2d7218eb4.tar.gz CMake-5c9edd38c6808592dc39d17a17ce74c2d7218eb4.tar.bz2 | |
Merge topic 'osx-archs-apple-only' into release-3.18
70ce1ad64a PCH: Avoid Apple-specific architecture flags on other platforms
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5118
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index c7baf2b..ab6a26c 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -3032,6 +3032,9 @@ std::string cmGeneratorTarget::GetCompilePDBDirectory( void cmGeneratorTarget::GetAppleArchs(const std::string& config, std::vector<std::string>& archVec) const { + if (!this->Makefile->IsOn("APPLE")) { + return; + } cmProp archs = nullptr; if (!config.empty()) { std::string defVarName = |