Skip to content

Commit d27767c

Browse files
AndrewSBAndrewSB
authored
Merge pull request Moya#2130 from kazedayo/master
add framework search path to support building xcframeworks via Carthage
2 parents 914e5b5 + c52e840 commit d27767c

File tree

1 file changed

+70
-32
lines changed

1 file changed

+70
-32
lines changed

‎Moya.xcodeproj/project.pbxproj‎

Lines changed: 70 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -963,20 +963,24 @@
963963
DYLIB_INSTALL_NAME_BASE = "@rpath";
964964
ENABLE_STRICT_OBJC_MSGSEND = YES;
965965
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
966-
"$(SRCROOT)/Carthage/Build/tvOS/",
967966
"$(inherited)",
967+
"$(SRCROOT)/Carthage/Build/",
968+
"$(SRCROOT)/Carthage/Build/tvOS",
968969
);
969970
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
970-
"$(SRCROOT)/Carthage/Build/iOS/",
971971
"$(inherited)",
972+
"$(SRCROOT)/Carthage/Build/",
973+
"$(SRCROOT)/Carthage/Build/iOS",
972974
);
973975
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
974-
"$(SRCROOT)/Carthage/Build/Mac/",
975976
"$(inherited)",
977+
"$(SRCROOT)/Carthage/Build/",
978+
"$(SRCROOT)/Carthage/Build/Mac",
976979
);
977980
"FRAMEWORK_SEARCH_PATHS[sdk=watch*]" = (
978-
"$(SRCROOT)/Carthage/Build/watchOS/",
979981
"$(inherited)",
982+
"$(SRCROOT)/Carthage/Build/",
983+
"$(SRCROOT)/Carthage/Build/watchOS",
980984
);
981985
FRAMEWORK_VERSION = A;
982986
GCC_NO_COMMON_BLOCKS = YES;
@@ -986,6 +990,7 @@
986990
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
987991
MACOSX_DEPLOYMENT_TARGET = 10.12;
988992
MTL_ENABLE_DEBUG_INFO = NO;
993+
ONLY_ACTIVE_ARCH = NO;
989994
PRODUCT_BUNDLE_IDENTIFIER = com.cocoapods.Moya;
990995
PRODUCT_NAME = "$(TARGET_NAME)";
991996
SDKROOT = macosx;
@@ -1012,20 +1017,24 @@
10121017
DYLIB_INSTALL_NAME_BASE = "@rpath";
10131018
ENABLE_STRICT_OBJC_MSGSEND = YES;
10141019
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
1015-
"$(SRCROOT)/Carthage/Build/tvOS/",
10161020
"$(inherited)",
1021+
"$(SRCROOT)/Carthage/Build/",
1022+
"$(SRCROOT)/Carthage/Build/tvOS",
10171023
);
10181024
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
1019-
"$(SRCROOT)/Carthage/Build/iOS/",
10201025
"$(inherited)",
1026+
"$(SRCROOT)/Carthage/Build/",
1027+
"$(SRCROOT)/Carthage/Build/iOS",
10211028
);
10221029
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
1023-
"$(SRCROOT)/Carthage/Build/Mac/",
10241030
"$(inherited)",
1031+
"$(SRCROOT)/Carthage/Build/",
1032+
"$(SRCROOT)/Carthage/Build/Mac",
10251033
);
10261034
"FRAMEWORK_SEARCH_PATHS[sdk=watch*]" = (
1027-
"$(SRCROOT)/Carthage/Build/watchOS/",
10281035
"$(inherited)",
1036+
"$(SRCROOT)/Carthage/Build/",
1037+
"$(SRCROOT)/Carthage/Build/watchOS",
10291038
);
10301039
FRAMEWORK_VERSION = A;
10311040
GCC_NO_COMMON_BLOCKS = YES;
@@ -1058,20 +1067,24 @@
10581067
DEBUG_INFORMATION_FORMAT = dwarf;
10591068
ENABLE_STRICT_OBJC_MSGSEND = YES;
10601069
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
1061-
"$(SRCROOT)/Carthage/Build/tvOS/",
10621070
"$(inherited)",
1071+
"$(SRCROOT)/Carthage/Build/",
1072+
"$(SRCROOT)/Carthage/Build/tvOS",
10631073
);
10641074
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
1065-
"$(SRCROOT)/Carthage/Build/iOS/",
10661075
"$(inherited)",
1076+
"$(SRCROOT)/Carthage/Build/",
1077+
"$(SRCROOT)/Carthage/Build/iOS",
10671078
);
10681079
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
1069-
"$(SRCROOT)/Carthage/Build/Mac/",
10701080
"$(inherited)",
1081+
"$(SRCROOT)/Carthage/Build/",
1082+
"$(SRCROOT)/Carthage/Build/Mac",
10711083
);
10721084
"FRAMEWORK_SEARCH_PATHS[sdk=watch*]" = (
1073-
"$(SRCROOT)/Carthage/Build/watchOS/",
10741085
"$(inherited)",
1086+
"$(SRCROOT)/Carthage/Build/",
1087+
"$(SRCROOT)/Carthage/Build/watchOS",
10751088
);
10761089
GCC_NO_COMMON_BLOCKS = YES;
10771090
INFOPLIST_FILE = "Sources/Supporting Files/Info.plist";
@@ -1160,20 +1173,24 @@
11601173
DYLIB_INSTALL_NAME_BASE = "@rpath";
11611174
ENABLE_STRICT_OBJC_MSGSEND = YES;
11621175
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
1163-
"$(SRCROOT)/Carthage/Build/tvOS/",
11641176
"$(inherited)",
1177+
"$(SRCROOT)/Carthage/Build/",
1178+
"$(SRCROOT)/Carthage/Build/tvOS",
11651179
);
11661180
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
1167-
"$(SRCROOT)/Carthage/Build/iOS/",
11681181
"$(inherited)",
1182+
"$(SRCROOT)/Carthage/Build/",
1183+
"$(SRCROOT)/Carthage/Build/iOS",
11691184
);
11701185
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
1171-
"$(SRCROOT)/Carthage/Build/Mac/",
11721186
"$(inherited)",
1187+
"$(SRCROOT)/Carthage/Build/",
1188+
"$(SRCROOT)/Carthage/Build/Mac",
11731189
);
11741190
"FRAMEWORK_SEARCH_PATHS[sdk=watch*]" = (
1175-
"$(SRCROOT)/Carthage/Build/watchOS/",
11761191
"$(inherited)",
1192+
"$(SRCROOT)/Carthage/Build/",
1193+
"$(SRCROOT)/Carthage/Build/watchOS",
11771194
);
11781195
FRAMEWORK_VERSION = A;
11791196
GCC_NO_COMMON_BLOCKS = YES;
@@ -1217,6 +1234,7 @@
12171234
DEVELOPMENT_TEAM = "";
12181235
FRAMEWORK_SEARCH_PATHS = (
12191236
"$(inherited)",
1237+
"$(PROJECT_DIR)/Carthage/Build/",
12201238
"$(PROJECT_DIR)/Carthage/Build/iOS",
12211239
);
12221240
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1258,6 +1276,7 @@
12581276
DEVELOPMENT_TEAM = "";
12591277
FRAMEWORK_SEARCH_PATHS = (
12601278
"$(inherited)",
1279+
"$(PROJECT_DIR)/Carthage/Build/",
12611280
"$(PROJECT_DIR)/Carthage/Build/iOS",
12621281
);
12631282
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1296,6 +1315,7 @@
12961315
DEVELOPMENT_TEAM = "";
12971316
FRAMEWORK_SEARCH_PATHS = (
12981317
"$(inherited)",
1318+
"$(PROJECT_DIR)/Carthage/Build/",
12991319
"$(PROJECT_DIR)/Carthage/Build/iOS",
13001320
);
13011321
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1337,6 +1357,7 @@
13371357
DEVELOPMENT_TEAM = "";
13381358
FRAMEWORK_SEARCH_PATHS = (
13391359
"$(inherited)",
1360+
"$(PROJECT_DIR)/Carthage/Build/",
13401361
"$(PROJECT_DIR)/Carthage/Build/iOS",
13411362
);
13421363
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1367,20 +1388,24 @@
13671388
DYLIB_INSTALL_NAME_BASE = "@rpath";
13681389
ENABLE_STRICT_OBJC_MSGSEND = YES;
13691390
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
1370-
"$(SRCROOT)/Carthage/Build/tvOS/",
13711391
"$(inherited)",
1392+
"$(SRCROOT)/Carthage/Build/",
1393+
"$(SRCROOT)/Carthage/Build/tvOS",
13721394
);
13731395
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
1374-
"$(SRCROOT)/Carthage/Build/iOS/",
13751396
"$(inherited)",
1397+
"$(SRCROOT)/Carthage/Build/",
1398+
"$(SRCROOT)/Carthage/Build/iOS",
13761399
);
13771400
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
1378-
"$(SRCROOT)/Carthage/Build/Mac/",
13791401
"$(inherited)",
1402+
"$(SRCROOT)/Carthage/Build/",
1403+
"$(SRCROOT)/Carthage/Build/Mac",
13801404
);
13811405
"FRAMEWORK_SEARCH_PATHS[sdk=watch*]" = (
1382-
"$(SRCROOT)/Carthage/Build/watchOS/",
13831406
"$(inherited)",
1407+
"$(SRCROOT)/Carthage/Build/",
1408+
"$(SRCROOT)/Carthage/Build/watchOS",
13841409
);
13851410
FRAMEWORK_VERSION = A;
13861411
GCC_NO_COMMON_BLOCKS = YES;
@@ -1480,20 +1505,24 @@
14801505
DYLIB_INSTALL_NAME_BASE = "@rpath";
14811506
ENABLE_STRICT_OBJC_MSGSEND = YES;
14821507
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
1483-
"$(SRCROOT)/Carthage/Build/tvOS/",
14841508
"$(inherited)",
1509+
"$(SRCROOT)/Carthage/Build/",
1510+
"$(SRCROOT)/Carthage/Build/tvOS",
14851511
);
14861512
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
1487-
"$(SRCROOT)/Carthage/Build/iOS/",
14881513
"$(inherited)",
1514+
"$(SRCROOT)/Carthage/Build/",
1515+
"$(SRCROOT)/Carthage/Build/iOS",
14891516
);
14901517
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
1491-
"$(SRCROOT)/Carthage/Build/Mac/",
14921518
"$(inherited)",
1519+
"$(SRCROOT)/Carthage/Build/",
1520+
"$(SRCROOT)/Carthage/Build/Mac",
14931521
);
14941522
"FRAMEWORK_SEARCH_PATHS[sdk=watch*]" = (
1495-
"$(SRCROOT)/Carthage/Build/watchOS/",
14961523
"$(inherited)",
1524+
"$(SRCROOT)/Carthage/Build/",
1525+
"$(SRCROOT)/Carthage/Build/watchOS",
14971526
);
14981527
FRAMEWORK_VERSION = A;
14991528
GCC_NO_COMMON_BLOCKS = YES;
@@ -1503,6 +1532,7 @@
15031532
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
15041533
MACOSX_DEPLOYMENT_TARGET = 10.12;
15051534
MTL_ENABLE_DEBUG_INFO = YES;
1535+
ONLY_ACTIVE_ARCH = YES;
15061536
PRODUCT_BUNDLE_IDENTIFIER = com.cocoapods.Moya;
15071537
PRODUCT_NAME = "$(TARGET_NAME)";
15081538
SDKROOT = macosx;
@@ -1524,20 +1554,24 @@
15241554
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
15251555
ENABLE_STRICT_OBJC_MSGSEND = YES;
15261556
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
1527-
"$(SRCROOT)/Carthage/Build/tvOS/",
15281557
"$(inherited)",
1558+
"$(SRCROOT)/Carthage/Build/",
1559+
"$(SRCROOT)/Carthage/Build/tvOS",
15291560
);
15301561
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
1531-
"$(SRCROOT)/Carthage/Build/iOS/",
15321562
"$(inherited)",
1563+
"$(SRCROOT)/Carthage/Build/",
1564+
"$(SRCROOT)/Carthage/Build/iOS",
15331565
);
15341566
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
1535-
"$(SRCROOT)/Carthage/Build/Mac/",
15361567
"$(inherited)",
1568+
"$(SRCROOT)/Carthage/Build/",
1569+
"$(SRCROOT)/Carthage/Build/Mac",
15371570
);
15381571
"FRAMEWORK_SEARCH_PATHS[sdk=watch*]" = (
1539-
"$(SRCROOT)/Carthage/Build/watchOS/",
15401572
"$(inherited)",
1573+
"$(SRCROOT)/Carthage/Build/",
1574+
"$(SRCROOT)/Carthage/Build/watchOS",
15411575
);
15421576
GCC_NO_COMMON_BLOCKS = YES;
15431577
INFOPLIST_FILE = "Sources/Supporting Files/Info.plist";
@@ -1569,20 +1603,24 @@
15691603
DYLIB_INSTALL_NAME_BASE = "@rpath";
15701604
ENABLE_STRICT_OBJC_MSGSEND = YES;
15711605
"FRAMEWORK_SEARCH_PATHS[sdk=appletv*]" = (
1572-
"$(SRCROOT)/Carthage/Build/tvOS/",
15731606
"$(inherited)",
1607+
"$(SRCROOT)/Carthage/Build/",
1608+
"$(SRCROOT)/Carthage/Build/tvOS",
15741609
);
15751610
"FRAMEWORK_SEARCH_PATHS[sdk=iphone*]" = (
1576-
"$(SRCROOT)/Carthage/Build/iOS/",
15771611
"$(inherited)",
1612+
"$(SRCROOT)/Carthage/Build/",
1613+
"$(SRCROOT)/Carthage/Build/iOS",
15781614
);
15791615
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = (
1580-
"$(SRCROOT)/Carthage/Build/Mac/",
15811616
"$(inherited)",
1617+
"$(SRCROOT)/Carthage/Build/",
1618+
"$(SRCROOT)/Carthage/Build/Mac",
15821619
);
15831620
"FRAMEWORK_SEARCH_PATHS[sdk=watch*]" = (
1584-
"$(SRCROOT)/Carthage/Build/watchOS/",
15851621
"$(inherited)",
1622+
"$(SRCROOT)/Carthage/Build/",
1623+
"$(SRCROOT)/Carthage/Build/watchOS",
15861624
);
15871625
FRAMEWORK_VERSION = A;
15881626
GCC_NO_COMMON_BLOCKS = YES;

0 commit comments

Comments
 (0)