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

Merge branch 'backport-3.28-visionOS' into visionOS

Browse Source
This commit is contained in:
Brad King
2024-02-09 11:37:11 -05:00
parent c673511263 22eb1b6d67
commit 871a4c5aac
5 changed files with 85 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalGenerator.cxx
+43 -8
View File
@@ -2011,14 +2011,49 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags,
cmValue deploymentTarget =
this->Makefile->GetDefinition("CMAKE_OSX_DEPLOYMENT_TARGET");
std::string deploymentTargetFlagVar =
"CMAKE_" + lang + "_OSX_DEPLOYMENT_TARGET_FLAG";
cmValue deploymentTargetFlag =
this->Makefile->GetDefinition(deploymentTargetFlagVar);
if (cmNonempty(deploymentTargetFlag) && cmNonempty(deploymentTarget)) {
flags += " ";
flags += *deploymentTargetFlag;
flags += *deploymentTarget;
if (cmNonempty(deploymentTarget)) {
std::string deploymentTargetFlagVar =
"CMAKE_" + lang + "_OSX_DEPLOYMENT_TARGET_FLAG";
cmValue deploymentTargetFlag =
this->Makefile->GetDefinition(deploymentTargetFlagVar);
if (cmNonempty(deploymentTargetFlag) &&
// CMAKE_<LANG>_COMPILER_TARGET overrides a --target= for
// CMAKE_OSX_DEPLOYMENT_TARGET, e.g., for visionOS.
(!cmHasLiteralPrefix(*deploymentTarget, "--target=") ||
this->Makefile
->GetDefinition(cmStrCat("CMAKE_", lang, "_COMPILER_TARGET"))
.IsEmpty())) {
std::string flag = *deploymentTargetFlag;
// Add the deployment target architecture to the flag, if needed.
static const std::string kARCH = "<ARCH>";
std::string::size_type archPos = flag.find(kARCH);
if (archPos != std::string::npos) {
// This placeholder is meant for visionOS, so default to arm64
// unless only non-arm64 archs are given.
std::string const arch =
(archs.empty() || cm::contains(archs, "arm64")) ? "arm64"
: archs[0];
// Replace the placeholder with its value.
flag = cmStrCat(flag.substr(0, archPos), arch,
flag.substr(archPos + kARCH.size()));
}
// Add the deployment target version to the flag.
static const std::string kVERSION_MIN = "<VERSION_MIN>";
std::string::size_type verPos = flag.find(kVERSION_MIN);
if (verPos != std::string::npos) {
// Replace the placeholder with its value.
flag = cmStrCat(flag.substr(0, verPos), *deploymentTarget,
flag.substr(verPos + kVERSION_MIN.size()));
} else {
// There is no placeholder, so append the value.
flag = cmStrCat(flag, *deploymentTarget);
}
flags += " ";
flags += flag;
}
}
}
}