Skip to content

Commit 24e36d4

Browse files
jspahrsummersjspahrsummers
committed
Merge pull request #257 from libgit2/fix-header-expansion
Fix ridiculous recursive header expansion
2 parents e7c0e05 + 10a7ffa commit 24e36d4

File tree

1 file changed

+39
-30
lines changed

1 file changed

+39
-30
lines changed

‎ObjectiveGitFramework.xcodeproj/project.pbxproj

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,17 +1400,17 @@
14001400
"External/libssh2-ios/include/libssh2",
14011401
);
14021402
LIBRARY_SEARCH_PATHS = (
1403-
.,
1403+
"$(inherited)",
14041404
"External/ios-openssl/lib",
14051405
"External/libssh2-ios/lib",
1406-
External,
14071406
);
14081407
OTHER_LDFLAGS = (
14091408
"-lgit2-iOS",
14101409
"-all_load",
14111410
);
14121411
PRODUCT_NAME = "ObjectiveGit-iOS";
14131412
PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/ObjectiveGit;
1413+
USER_HEADER_SEARCH_PATHS = "";
14141414
};
14151415
name = Debug;
14161416
};
@@ -1425,17 +1425,17 @@
14251425
"External/libssh2-ios/include/libssh2",
14261426
);
14271427
LIBRARY_SEARCH_PATHS = (
1428-
.,
1428+
"$(inherited)",
14291429
"External/ios-openssl/lib",
14301430
"External/libssh2-ios/lib",
1431-
External,
14321431
);
14331432
OTHER_LDFLAGS = (
14341433
"-lgit2-iOS",
14351434
"-all_load",
14361435
);
14371436
PRODUCT_NAME = "ObjectiveGit-iOS";
14381437
PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/ObjectiveGit;
1438+
USER_HEADER_SEARCH_PATHS = "";
14391439
};
14401440
name = Release;
14411441
};
@@ -1447,19 +1447,19 @@
14471447
DYLIB_CURRENT_VERSION = 1;
14481448
FRAMEWORK_VERSION = A;
14491449
GCC_PREFIX_HEADER = ObjectiveGitFramework_Prefix.pch;
1450-
HEADER_SEARCH_PATHS = /usr/local/include;
1451-
INFOPLIST_FILE = Info.plist;
1452-
LIBRARY_SEARCH_PATHS = (
1453-
.,
1454-
External,
1450+
HEADER_SEARCH_PATHS = (
1451+
"$(inherited)",
1452+
/usr/local/include,
14551453
);
1454+
INFOPLIST_FILE = Info.plist;
14561455
OTHER_LDFLAGS = (
14571456
"-lgit2",
14581457
"-force_load",
14591458
External/libgit2.a,
14601459
/usr/local/lib/libssh2.a,
14611460
);
14621461
PRODUCT_NAME = ObjectiveGit;
1462+
USER_HEADER_SEARCH_PATHS = "";
14631463
WRAPPER_EXTENSION = framework;
14641464
};
14651465
name = Debug;
@@ -1472,19 +1472,19 @@
14721472
DYLIB_CURRENT_VERSION = 1;
14731473
FRAMEWORK_VERSION = A;
14741474
GCC_PREFIX_HEADER = ObjectiveGitFramework_Prefix.pch;
1475-
HEADER_SEARCH_PATHS = /usr/local/include;
1476-
INFOPLIST_FILE = Info.plist;
1477-
LIBRARY_SEARCH_PATHS = (
1478-
.,
1479-
External,
1475+
HEADER_SEARCH_PATHS = (
1476+
"$(inherited)",
1477+
/usr/local/include,
14801478
);
1479+
INFOPLIST_FILE = Info.plist;
14811480
OTHER_LDFLAGS = (
14821481
"-lgit2",
14831482
"-force_load",
14841483
External/libgit2.a,
14851484
/usr/local/lib/libssh2.a,
14861485
);
14871486
PRODUCT_NAME = ObjectiveGit;
1487+
USER_HEADER_SEARCH_PATHS = "";
14881488
WRAPPER_EXTENSION = framework;
14891489
};
14901490
name = Release;
@@ -1496,9 +1496,12 @@
14961496
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
14971497
GCC_STRICT_ALIASING = NO;
14981498
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
1499-
HEADER_SEARCH_PATHS = libgit2/include;
1499+
HEADER_SEARCH_PATHS = External/libgit2/include;
15001500
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
1501-
LIBRARY_SEARCH_PATHS = .;
1501+
LIBRARY_SEARCH_PATHS = (
1502+
.,
1503+
External,
1504+
);
15021505
MACOSX_DEPLOYMENT_TARGET = 10.7;
15031506
TEST_AFTER_BUILD = NO;
15041507
};
@@ -1511,9 +1514,12 @@
15111514
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
15121515
GCC_STRICT_ALIASING = NO;
15131516
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
1514-
HEADER_SEARCH_PATHS = libgit2/include;
1517+
HEADER_SEARCH_PATHS = External/libgit2/include;
15151518
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
1516-
LIBRARY_SEARCH_PATHS = .;
1519+
LIBRARY_SEARCH_PATHS = (
1520+
.,
1521+
External,
1522+
);
15171523
MACOSX_DEPLOYMENT_TARGET = 10.7;
15181524
TEST_AFTER_BUILD = NO;
15191525
};
@@ -1574,7 +1580,7 @@
15741580
FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"";
15751581
GCC_PREFIX_HEADER = "ObjectiveGitTests/ObjectiveGitTests-Prefix.pch";
15761582
HEADER_SEARCH_PATHS = (
1577-
libgit2/include,
1583+
"$(inherited)",
15781584
ObjectiveGitTests/specta/src,
15791585
"ObjectiveGitTests/expecta/src/**",
15801586
);
@@ -1592,7 +1598,7 @@
15921598
FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"";
15931599
GCC_PREFIX_HEADER = "ObjectiveGitTests/ObjectiveGitTests-Prefix.pch";
15941600
HEADER_SEARCH_PATHS = (
1595-
libgit2/include,
1601+
"$(inherited)",
15961602
ObjectiveGitTests/specta/src,
15971603
"ObjectiveGitTests/expecta/src/**",
15981604
);
@@ -1610,9 +1616,12 @@
16101616
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
16111617
GCC_STRICT_ALIASING = NO;
16121618
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO;
1613-
HEADER_SEARCH_PATHS = libgit2/include;
1619+
HEADER_SEARCH_PATHS = External/libgit2/include;
16141620
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
1615-
LIBRARY_SEARCH_PATHS = .;
1621+
LIBRARY_SEARCH_PATHS = (
1622+
.,
1623+
External,
1624+
);
16161625
MACOSX_DEPLOYMENT_TARGET = 10.7;
16171626
TEST_AFTER_BUILD = NO;
16181627
};
@@ -1626,19 +1635,19 @@
16261635
DYLIB_CURRENT_VERSION = 1;
16271636
FRAMEWORK_VERSION = A;
16281637
GCC_PREFIX_HEADER = ObjectiveGitFramework_Prefix.pch;
1629-
HEADER_SEARCH_PATHS = /usr/local/include;
1630-
INFOPLIST_FILE = Info.plist;
1631-
LIBRARY_SEARCH_PATHS = (
1632-
.,
1633-
External,
1638+
HEADER_SEARCH_PATHS = (
1639+
"$(inherited)",
1640+
/usr/local/include,
16341641
);
1642+
INFOPLIST_FILE = Info.plist;
16351643
OTHER_LDFLAGS = (
16361644
"-lgit2",
16371645
"-force_load",
16381646
External/libgit2.a,
16391647
/usr/local/lib/libssh2.a,
16401648
);
16411649
PRODUCT_NAME = ObjectiveGit;
1650+
USER_HEADER_SEARCH_PATHS = "";
16421651
WRAPPER_EXTENSION = framework;
16431652
};
16441653
name = Profile;
@@ -1654,17 +1663,17 @@
16541663
"External/libssh2-ios/include/libssh2",
16551664
);
16561665
LIBRARY_SEARCH_PATHS = (
1657-
.,
1666+
"$(inherited)",
16581667
"External/ios-openssl/lib",
16591668
"External/libssh2-ios/lib",
1660-
External,
16611669
);
16621670
OTHER_LDFLAGS = (
16631671
"-lgit2-iOS",
16641672
"-all_load",
16651673
);
16661674
PRODUCT_NAME = "ObjectiveGit-iOS";
16671675
PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/ObjectiveGit;
1676+
USER_HEADER_SEARCH_PATHS = "";
16681677
};
16691678
name = Profile;
16701679
};
@@ -1675,7 +1684,7 @@
16751684
FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"";
16761685
GCC_PREFIX_HEADER = "ObjectiveGitTests/ObjectiveGitTests-Prefix.pch";
16771686
HEADER_SEARCH_PATHS = (
1678-
libgit2/include,
1687+
"$(inherited)",
16791688
ObjectiveGitTests/specta/src,
16801689
"ObjectiveGitTests/expecta/src/**",
16811690
);

0 commit comments

Comments
 (0)