Skip to content

Commit 5a9919e

Browse files
brentleyjonesbrentleyjones
authored
Add missing header search paths (#645)
1 parent fdc8047 commit 5a9919e

File tree

25 files changed

+535
-27
lines changed

25 files changed

+535
-27
lines changed

‎examples/ios_app/test/fixtures/bwb.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,6 +1386,10 @@
13861386
TARGETED_DEVICE_FAMILY = "1,2";
13871387
TARGET_NAME = ExampleUITests.__internal__.__test_bundle;
13881388
TEST_TARGET_NAME = Example;
1389+
USER_HEADER_SEARCH_PATHS = (
1390+
"$(PROJECT_DIR)",
1391+
"$(BUILD_DIR)/bazel-out/ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin",
1392+
);
13891393
};
13901394
name = Debug;
13911395
};

‎examples/ios_app/test/fixtures/bwb_spec.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,15 @@
993993
"type": "com.apple.product-type.library.static"
994994
},
995995
"resource_bundle_dependencies": [],
996-
"search_paths": {},
996+
"search_paths": {
997+
"quote_includes": [
998+
".",
999+
{
1000+
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-a0d0e3b8f217/bin",
1001+
"t": "g"
1002+
}
1003+
]
1004+
},
9971005
"swiftmodules": [],
9981006
"test_host": null
9991007
},

‎examples/ios_app/test/fixtures/bwx.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,6 +1506,10 @@
15061506
TARGETED_DEVICE_FAMILY = "1,2";
15071507
TARGET_NAME = ExampleUITests.__internal__.__test_bundle;
15081508
TEST_TARGET_NAME = Example;
1509+
USER_HEADER_SEARCH_PATHS = (
1510+
"$(PROJECT_DIR)",
1511+
"$(BUILD_DIR)/bazel-out/ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin",
1512+
);
15091513
};
15101514
name = Debug;
15111515
};

‎examples/ios_app/test/fixtures/bwx_spec.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,15 @@
10321032
"type": "com.apple.product-type.library.static"
10331033
},
10341034
"resource_bundle_dependencies": [],
1035-
"search_paths": {},
1035+
"search_paths": {
1036+
"quote_includes": [
1037+
".",
1038+
{
1039+
"_": "ios-x86_64-min15.0-applebin_ios-ios_x86_64-dbg-ST-8100579b5c54/bin",
1040+
"t": "g"
1041+
}
1042+
]
1043+
},
10361044
"swiftmodules": [],
10371045
"test_host": null
10381046
},

‎test/fixtures/cc/bwb.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,8 @@
541541
USER_HEADER_SEARCH_PATHS = (
542542
"$(BAZEL_EXTERNAL)/examples_cc_external",
543543
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin/external/examples_cc_external",
544+
"$(PROJECT_DIR)",
545+
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin",
544546
);
545547
};
546548
name = Debug;

‎test/fixtures/cc/bwb_spec.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,11 @@
460460
{
461461
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin/external/examples_cc_external",
462462
"t": "g"
463+
},
464+
".",
465+
{
466+
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin",
467+
"t": "g"
463468
}
464469
]
465470
},

‎test/fixtures/cc/bwx.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,8 @@
772772
USER_HEADER_SEARCH_PATHS = (
773773
"$(BAZEL_EXTERNAL)/examples_cc_external",
774774
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-ccd9595da841/bin/external/examples_cc_external",
775+
"$(PROJECT_DIR)",
776+
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-ccd9595da841/bin",
775777
);
776778
};
777779
name = Debug;

‎test/fixtures/cc/bwx_spec.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,11 @@
455455
{
456456
"_": "darwin_x86_64-dbg-ST-ccd9595da841/bin/external/examples_cc_external",
457457
"t": "g"
458+
},
459+
".",
460+
{
461+
"_": "darwin_x86_64-dbg-ST-ccd9595da841/bin",
462+
"t": "g"
458463
}
459464
]
460465
},

‎test/fixtures/generator/bwb.xcodeproj/project.pbxproj

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2222,6 +2222,10 @@
22222222
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
22232223
SWIFT_VERSION = 5;
22242224
TARGET_NAME = PathKit;
2225+
USER_HEADER_SEARCH_PATHS = (
2226+
"$(PROJECT_DIR)",
2227+
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin",
2228+
);
22252229
};
22262230
name = Debug;
22272231
};
@@ -2260,6 +2264,10 @@
22602264
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
22612265
SWIFT_VERSION = 5;
22622266
TARGET_NAME = XcodeProj;
2267+
USER_HEADER_SEARCH_PATHS = (
2268+
"$(PROJECT_DIR)",
2269+
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin",
2270+
);
22632271
};
22642272
name = Debug;
22652273
};
@@ -2286,6 +2294,10 @@
22862294
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
22872295
SWIFT_VERSION = 5;
22882296
TARGET_NAME = AEXML;
2297+
USER_HEADER_SEARCH_PATHS = (
2298+
"$(PROJECT_DIR)",
2299+
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin",
2300+
);
22892301
};
22902302
name = Debug;
22912303
};
@@ -2354,6 +2366,10 @@
23542366
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
23552367
SWIFT_VERSION = 5;
23562368
TARGET_NAME = XCTestDynamicOverlay;
2369+
USER_HEADER_SEARCH_PATHS = (
2370+
"$(PROJECT_DIR)",
2371+
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin",
2372+
);
23572373
};
23582374
name = Debug;
23592375
};
@@ -2381,6 +2397,10 @@
23812397
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
23822398
SWIFT_VERSION = 5;
23832399
TARGET_NAME = CustomDump;
2400+
USER_HEADER_SEARCH_PATHS = (
2401+
"$(PROJECT_DIR)",
2402+
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin",
2403+
);
23842404
};
23852405
name = Debug;
23862406
};
@@ -2432,6 +2452,10 @@
24322452
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
24332453
SWIFT_VERSION = 5;
24342454
TARGET_NAME = tests;
2455+
USER_HEADER_SEARCH_PATHS = (
2456+
"$(PROJECT_DIR)",
2457+
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin",
2458+
);
24352459
};
24362460
name = Debug;
24372461
};
@@ -2458,6 +2482,10 @@
24582482
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
24592483
SWIFT_VERSION = 5;
24602484
TARGET_NAME = OrderedCollections;
2485+
USER_HEADER_SEARCH_PATHS = (
2486+
"$(PROJECT_DIR)",
2487+
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin",
2488+
);
24612489
};
24622490
name = Debug;
24632491
};
@@ -2525,6 +2553,10 @@
25252553
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
25262554
SWIFT_VERSION = 5;
25272555
TARGET_NAME = generator.library;
2556+
USER_HEADER_SEARCH_PATHS = (
2557+
"$(PROJECT_DIR)",
2558+
"$(BUILD_DIR)/bazel-out/darwin_x86_64-dbg-ST-5534cb307cb8/bin",
2559+
);
25282560
};
25292561
name = Debug;
25302562
};

‎test/fixtures/generator/bwb_spec.json

Lines changed: 72 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,15 @@
222222
"type": "com.apple.product-type.library.static"
223223
},
224224
"resource_bundle_dependencies": [],
225-
"search_paths": {},
225+
"search_paths": {
226+
"quote_includes": [
227+
".",
228+
{
229+
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin",
230+
"t": "g"
231+
}
232+
]
233+
},
226234
"swiftmodules": [
227235
{
228236
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin/external/com_github_apple_swift_collections/OrderedCollections.swiftmodule",
@@ -445,7 +453,15 @@
445453
"type": "com.apple.product-type.library.static"
446454
},
447455
"resource_bundle_dependencies": [],
448-
"search_paths": {},
456+
"search_paths": {
457+
"quote_includes": [
458+
".",
459+
{
460+
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin",
461+
"t": "g"
462+
}
463+
]
464+
},
449465
"swiftmodules": [
450466
{
451467
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin/external/com_github_apple_swift_collections/OrderedCollections.swiftmodule",
@@ -725,7 +741,15 @@
725741
"type": "com.apple.product-type.library.static"
726742
},
727743
"resource_bundle_dependencies": [],
728-
"search_paths": {},
744+
"search_paths": {
745+
"quote_includes": [
746+
".",
747+
{
748+
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin",
749+
"t": "g"
750+
}
751+
]
752+
},
729753
"swiftmodules": [],
730754
"test_host": null
731755
},
@@ -792,7 +816,15 @@
792816
"type": "com.apple.product-type.library.static"
793817
},
794818
"resource_bundle_dependencies": [],
795-
"search_paths": {},
819+
"search_paths": {
820+
"quote_includes": [
821+
".",
822+
{
823+
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin",
824+
"t": "g"
825+
}
826+
]
827+
},
796828
"swiftmodules": [],
797829
"test_host": null
798830
},
@@ -957,7 +989,15 @@
957989
"type": "com.apple.product-type.library.static"
958990
},
959991
"resource_bundle_dependencies": [],
960-
"search_paths": {},
992+
"search_paths": {
993+
"quote_includes": [
994+
".",
995+
{
996+
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin",
997+
"t": "g"
998+
}
999+
]
1000+
},
9611001
"swiftmodules": [
9621002
{
9631003
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin/external/com_github_pointfreeco_xctest_dynamic_overlay/XCTestDynamicOverlay.swiftmodule",
@@ -1029,7 +1069,15 @@
10291069
"type": "com.apple.product-type.library.static"
10301070
},
10311071
"resource_bundle_dependencies": [],
1032-
"search_paths": {},
1072+
"search_paths": {
1073+
"quote_includes": [
1074+
".",
1075+
{
1076+
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin",
1077+
"t": "g"
1078+
}
1079+
]
1080+
},
10331081
"swiftmodules": [],
10341082
"test_host": null
10351083
},
@@ -1112,7 +1160,15 @@
11121160
"type": "com.apple.product-type.library.static"
11131161
},
11141162
"resource_bundle_dependencies": [],
1115-
"search_paths": {},
1163+
"search_paths": {
1164+
"quote_includes": [
1165+
".",
1166+
{
1167+
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin",
1168+
"t": "g"
1169+
}
1170+
]
1171+
},
11161172
"swiftmodules": [],
11171173
"test_host": null
11181174
},
@@ -1558,7 +1614,15 @@
15581614
"type": "com.apple.product-type.library.static"
15591615
},
15601616
"resource_bundle_dependencies": [],
1561-
"search_paths": {},
1617+
"search_paths": {
1618+
"quote_includes": [
1619+
".",
1620+
{
1621+
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin",
1622+
"t": "g"
1623+
}
1624+
]
1625+
},
15621626
"swiftmodules": [
15631627
{
15641628
"_": "darwin_x86_64-dbg-ST-5534cb307cb8/bin/external/com_github_tadija_aexml/AEXML.swiftmodule",

0 commit comments

Comments
 (0)