From c6fe902a30deb063e5f8e1a26300c34772c26278 Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Tue, 19 Mar 2019 14:19:29 +0800 Subject: [PATCH] Fix the SDWebImage Test project using the framework xcconfig, should ignore the prefix header --- Configs/Test-Debug.xcconfig | 5 +++++ Configs/Test-Release.xcconfig | 5 +++++ Configs/Test-Shared.xcconfig | 7 ++++++ .../project.pbxproj | 22 +++++++++++++++++-- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 Configs/Test-Debug.xcconfig create mode 100644 Configs/Test-Release.xcconfig create mode 100644 Configs/Test-Shared.xcconfig diff --git a/Configs/Test-Debug.xcconfig b/Configs/Test-Debug.xcconfig new file mode 100644 index 00000000..d3c686e2 --- /dev/null +++ b/Configs/Test-Debug.xcconfig @@ -0,0 +1,5 @@ +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 + +#include "Module-Debug.xcconfig" +#include "Test-Shared.xcconfig" diff --git a/Configs/Test-Release.xcconfig b/Configs/Test-Release.xcconfig new file mode 100644 index 00000000..b3683aed --- /dev/null +++ b/Configs/Test-Release.xcconfig @@ -0,0 +1,5 @@ +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 + +#include "Module-Release.xcconfig" +#include "Test-Shared.xcconfig" diff --git a/Configs/Test-Shared.xcconfig b/Configs/Test-Shared.xcconfig new file mode 100644 index 00000000..f8229336 --- /dev/null +++ b/Configs/Test-Shared.xcconfig @@ -0,0 +1,7 @@ +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 + +#include "Module-Shared.xcconfig" + +// Implicitly include the named header. The path given should either be a project relative path or an absolute path. +GCC_PREFIX_HEADER = diff --git a/Tests/SDWebImage Tests.xcodeproj/project.pbxproj b/Tests/SDWebImage Tests.xcodeproj/project.pbxproj index 30a05d56..e53ee549 100644 --- a/Tests/SDWebImage Tests.xcodeproj/project.pbxproj +++ b/Tests/SDWebImage Tests.xcodeproj/project.pbxproj @@ -22,6 +22,12 @@ 327054E3206CEFF3006EA328 /* TestImageAnimated.apng in Resources */ = {isa = PBXBuildFile; fileRef = 327054E1206CEFF3006EA328 /* TestImageAnimated.apng */; }; 327A418C211D660600495442 /* TestImage.heic in Resources */ = {isa = PBXBuildFile; fileRef = 327A418B211D660600495442 /* TestImage.heic */; }; 327A418D211D660600495442 /* TestImage.heic in Resources */ = {isa = PBXBuildFile; fileRef = 327A418B211D660600495442 /* TestImage.heic */; }; + 328BAF292240C08E00FC70DD /* Test-Shared.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 328BAF262240C08E00FC70DD /* Test-Shared.xcconfig */; }; + 328BAF2A2240C08E00FC70DD /* Test-Shared.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 328BAF262240C08E00FC70DD /* Test-Shared.xcconfig */; }; + 328BAF2B2240C08E00FC70DD /* Test-Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 328BAF272240C08E00FC70DD /* Test-Release.xcconfig */; }; + 328BAF2C2240C08E00FC70DD /* Test-Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 328BAF272240C08E00FC70DD /* Test-Release.xcconfig */; }; + 328BAF2D2240C08E00FC70DD /* Test-Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 328BAF282240C08E00FC70DD /* Test-Debug.xcconfig */; }; + 328BAF2E2240C08E00FC70DD /* Test-Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 328BAF282240C08E00FC70DD /* Test-Debug.xcconfig */; }; 328BB6DD20825E9800760D6C /* SDWebImageTestCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB6DC20825E9800760D6C /* SDWebImageTestCache.m */; }; 328BB6DE20825E9800760D6C /* SDWebImageTestCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 328BB6DC20825E9800760D6C /* SDWebImageTestCache.m */; }; 32905E64211D786E00460FCF /* TestImage.heif in Resources */ = {isa = PBXBuildFile; fileRef = 32905E63211D786E00460FCF /* TestImage.heif */; }; @@ -78,6 +84,9 @@ 3264FF2E205D42CB00F6BD48 /* SDWebImageTestTransformer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageTestTransformer.m; sourceTree = ""; }; 327054E1206CEFF3006EA328 /* TestImageAnimated.apng */ = {isa = PBXFileReference; lastKnownFileType = file; path = TestImageAnimated.apng; sourceTree = ""; }; 327A418B211D660600495442 /* TestImage.heic */ = {isa = PBXFileReference; lastKnownFileType = file; path = TestImage.heic; sourceTree = ""; }; + 328BAF262240C08E00FC70DD /* Test-Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Test-Shared.xcconfig"; sourceTree = ""; }; + 328BAF272240C08E00FC70DD /* Test-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Test-Release.xcconfig"; sourceTree = ""; }; + 328BAF282240C08E00FC70DD /* Test-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Test-Debug.xcconfig"; sourceTree = ""; }; 328BB6DB20825E9800760D6C /* SDWebImageTestCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDWebImageTestCache.h; sourceTree = ""; }; 328BB6DC20825E9800760D6C /* SDWebImageTestCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWebImageTestCache.m; sourceTree = ""; }; 32905E63211D786E00460FCF /* TestImage.heif */ = {isa = PBXFileReference; lastKnownFileType = file; path = TestImage.heif; sourceTree = ""; }; @@ -253,6 +262,9 @@ EADD19EC219915E300804BB0 /* Module-Debug.xcconfig */, EADD19E9219915E300804BB0 /* Module-Release.xcconfig */, EADD19EE219915E300804BB0 /* Module-Shared.xcconfig */, + 328BAF282240C08E00FC70DD /* Test-Debug.xcconfig */, + 328BAF272240C08E00FC70DD /* Test-Release.xcconfig */, + 328BAF262240C08E00FC70DD /* Test-Shared.xcconfig */, ); name = Configs; path = ../Configs; @@ -338,12 +350,15 @@ files = ( 327054E3206CEFF3006EA328 /* TestImageAnimated.apng in Resources */, 32B99EA3203B31360017FD66 /* TestImage.gif in Resources */, + 328BAF2C2240C08E00FC70DD /* Test-Release.xcconfig in Resources */, + 328BAF2E2240C08E00FC70DD /* Test-Debug.xcconfig in Resources */, 32B99EA4203B31360017FD66 /* TestImage.jpg in Resources */, 32B99EA6203B31360017FD66 /* TestImage.png in Resources */, 32B99EA2203B31360017FD66 /* MonochromeTestImage.jpg in Resources */, 32905E65211D786E00460FCF /* TestImage.heif in Resources */, 327A418D211D660600495442 /* TestImage.heic in Resources */, 32B99EA5203B31360017FD66 /* TestImageLarge.jpg in Resources */, + 328BAF2A2240C08E00FC70DD /* Test-Shared.xcconfig in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -351,10 +366,13 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 328BAF2B2240C08E00FC70DD /* Test-Release.xcconfig in Resources */, 327A418C211D660600495442 /* TestImage.heic in Resources */, + 328BAF292240C08E00FC70DD /* Test-Shared.xcconfig in Resources */, 5F7F38AD1AE2A77A00B0E330 /* TestImage.jpg in Resources */, 32905E64211D786E00460FCF /* TestImage.heif in Resources */, 43828A451DA67F9900000E62 /* TestImageLarge.jpg in Resources */, + 328BAF2D2240C08E00FC70DD /* Test-Debug.xcconfig in Resources */, 433BBBB71D7EF8200086B6E9 /* TestImage.gif in Resources */, DA248D61195472AA00390AB0 /* InfoPlist.strings in Resources */, 433BBBB91D7EF8260086B6E9 /* TestImage.png in Resources */, @@ -543,14 +561,14 @@ }; DA248D4A1954721A00390AB0 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EADD19EC219915E300804BB0 /* Module-Debug.xcconfig */; + baseConfigurationReference = 328BAF282240C08E00FC70DD /* Test-Debug.xcconfig */; buildSettings = { }; name = Debug; }; DA248D4B1954721A00390AB0 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EADD19E9219915E300804BB0 /* Module-Release.xcconfig */; + baseConfigurationReference = 328BAF272240C08E00FC70DD /* Test-Release.xcconfig */; buildSettings = { }; name = Release;