reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-24 12:09:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Xcode: rename embedded SDK query function

Browse Source
This commit is contained in:
Gregor Jasny 2017-11-04 13:29:25 +01:00
parent 4309ed25ee
commit 8f4663ffb2
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmGeneratorTarget.cxx
View File

@ -1529,7 +1529,8 @@ std::string cmGeneratorTarget::GetAppBundleDirectory(
ext = "app";
}
fpath += ext;
if (shouldAddContentLevel(level) && !this->Makefile->PlatformIsAppleIos()) {
if (shouldAddContentLevel(level) &&
!this->Makefile->PlatformIsAppleEmbedded()) {
fpath += "/Contents";
if (shouldAddFullLevel(level)) {
fpath += "/MacOS";
@ -1559,7 +1560,8 @@ std::string cmGeneratorTarget::GetCFBundleDirectory(
}
}
fpath += ext;
if (shouldAddContentLevel(level) && !this->Makefile->PlatformIsAppleIos()) {
if (shouldAddContentLevel(level) &&
!this->Makefile->PlatformIsAppleEmbedded()) {
fpath += "/Contents";
if (shouldAddFullLevel(level)) {
fpath += "/MacOS";
@ -1579,7 +1581,8 @@ std::string cmGeneratorTarget::GetFrameworkDirectory(
ext = "framework";
}
fpath += ext;
if (shouldAddFullLevel(level) && !this->Makefile->PlatformIsAppleIos()) {
if (shouldAddFullLevel(level) &&
!this->Makefile->PlatformIsAppleEmbedded()) {
fpath += "/Versions/";
fpath += this->GetFrameworkVersion();
}
@ -3004,7 +3007,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name, std::string& soName,
if (this->IsFrameworkOnApple()) {
realName = prefix;
if (!this->Makefile->PlatformIsAppleIos()) {
if (!this->Makefile->PlatformIsAppleEmbedded()) {
realName += "Versions/";
realName += this->GetFrameworkVersion();
realName += "/";

2
Source/cmGlobalGenerator.cxx
View File

@ -2609,7 +2609,7 @@ std::string cmGlobalGenerator::GenerateRuleFile(
bool cmGlobalGenerator::ShouldStripResourcePath(cmMakefile* mf) const
{
return mf->PlatformIsAppleIos();
return mf->PlatformIsAppleEmbedded();
}
std::string cmGlobalGenerator::GetSharedLibFlagsForLanguage(

4
Source/cmGlobalXCodeGenerator.cxx
View File

@ -1172,7 +1172,7 @@ bool cmGlobalXCodeGenerator::CreateXCodeTargets(
// dstPath in frameworks is relative to Versions/<version>
ostr << keySources.first;
} else if (keySources.first != "MacOS") {
if (gtgt->Target->GetMakefile()->PlatformIsAppleIos()) {
if (gtgt->Target->GetMakefile()->PlatformIsAppleEmbedded()) {
ostr << keySources.first;
} else {
// dstPath in bundles is relative to Contents/MacOS
@ -3605,7 +3605,7 @@ bool cmGlobalXCodeGenerator::UseEffectivePlatformName(cmMakefile* mf) const
"XCODE_EMIT_EFFECTIVE_PLATFORM_NAME");
if (!epnValue) {
return mf->PlatformIsAppleIos();
return mf->PlatformIsAppleEmbedded();
}
return cmSystemTools::IsOn(epnValue);

4
Source/cmInstallTargetGenerator.cxx
View File

@ -167,7 +167,7 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(
to1 += ".";
to1 += ext;
to1 += "/";
if (!mf->PlatformIsAppleIos()) {
if (!mf->PlatformIsAppleEmbedded()) {
to1 += "Contents/MacOS/";
}
to1 += targetName;
@ -796,7 +796,7 @@ void cmInstallTargetGenerator::AddUniversalInstallRule(
{
cmMakefile const* mf = this->Target->Target->GetMakefile();
if (!mf->PlatformIsAppleIos() || !mf->IsOn("XCODE")) {
if (!mf->PlatformIsAppleEmbedded() || !mf->IsOn("XCODE")) {
return;
}

2
Source/cmMakefile.cxx
View File

@ -2244,7 +2244,7 @@ bool cmMakefile::PlatformIsx32() const
return false;
}
bool cmMakefile::PlatformIsAppleIos() const
bool cmMakefile::PlatformIsAppleEmbedded() const
{
std::string sdkRoot;
sdkRoot = this->GetSafeDefinition("CMAKE_OSX_SYSROOT");

2
Source/cmMakefile.h
View File

@ -440,7 +440,7 @@ public:
bool PlatformIsx32() const;
/** Return whether the target platform is Apple iOS. */
bool PlatformIsAppleIos() const;
bool PlatformIsAppleEmbedded() const;
/** Retrieve soname flag for the specified language if supported */
const char* GetSONameFlag(const std::string& language) const;

4
Source/cmOSXBundleGenerator.cxx
View File

@ -82,7 +82,7 @@ void cmOSXBundleGenerator::CreateFramework(const std::string& targetName,
// Configure the Info.plist file
std::string plist = newoutpath;
if (!this->Makefile->PlatformIsAppleIos()) {
if (!this->Makefile->PlatformIsAppleEmbedded()) {
// Put the Info.plist file into the Resources directory.
this->MacContentFolders->insert("Resources");
plist += "/Resources";
@ -93,7 +93,7 @@ void cmOSXBundleGenerator::CreateFramework(const std::string& targetName,
plist.c_str());
// Generate Versions directory only for MacOSX frameworks
if (this->Makefile->PlatformIsAppleIos()) {
if (this->Makefile->PlatformIsAppleEmbedded()) {
return;
}