mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 22:30:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

PCH: Avoid Apple-specific architecture flags on other platforms

Browse Source 
Since commit f593b354da (PCH: Add support for multi architecture iOS
projects, 2020-04-02, v3.18.0-rc1~414^2) the `OSX_ARCHITECTURES` target
property (and corresponding `CMAKE_OSX_ARCHITECTURES` variable) affects
flags on non-Apple platforms by accident.  Add a missing condition to
avoid this.

Fixes: #21072
This commit is contained in:
Brad King
2020-08-10 13:29:29 -04:00
parent 63a65baf4c
commit 70ce1ad64a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGeneratorTarget.cxx
+3
View File
@@ -3032,6 +3032,9 @@ std::string cmGeneratorTarget::GetCompilePDBDirectory(
void cmGeneratorTarget::GetAppleArchs(const std::string& config, void cmGeneratorTarget::GetAppleArchs(const std::string& config,
std::vector<std::string>& archVec) const std::vector<std::string>& archVec) const
{ {
if (!this->Makefile->IsOn("APPLE")) {
return;
}
cmProp archs = nullptr; cmProp archs = nullptr;
if (!config.empty()) { if (!config.empty()) {
std::string defVarName = std::string defVarName =