Commit be154d10 authored by Eloy Duran's avatar Eloy Duran

Make sure to add the actual location of the headers to the search path.

It is beyond me how some Xcode configurations have ever been able to build
without this. Gotta love it.
parent d78692a5
...@@ -33,8 +33,9 @@ module Pod ...@@ -33,8 +33,9 @@ module Pod
def xcconfig def xcconfig
@xcconfig ||= Xcode::Config.new({ @xcconfig ||= Xcode::Config.new({
# in a workspace this is where the static library headers should be found # In a workspace this is where the static library headers should be found
'USER_HEADER_SEARCH_PATHS' => '$(BUILT_PRODUCTS_DIR)', # We could also make this recursive, but let's let the user decide on that.
'USER_HEADER_SEARCH_PATHS' => '$(BUILT_PRODUCTS_DIR)/Pods',
# search the user headers # search the user headers
'ALWAYS_SEARCH_USER_PATHS' => 'YES', 'ALWAYS_SEARCH_USER_PATHS' => 'YES',
}) })
......
...@@ -19,7 +19,7 @@ describe "Pod::Installer" do ...@@ -19,7 +19,7 @@ describe "Pod::Installer" do
['Classes'], ['Classes'],
"{Classes,External/Reachability}/*.{h,m}", "{Classes,External/Reachability}/*.{h,m}",
{ {
"USER_HEADER_SEARCH_PATHS" => "$(BUILT_PRODUCTS_DIR)", "USER_HEADER_SEARCH_PATHS" => "$(BUILT_PRODUCTS_DIR)/Pods",
"ALWAYS_SEARCH_USER_PATHS" => "YES", "ALWAYS_SEARCH_USER_PATHS" => "YES",
"OTHER_LDFLAGS" => "-framework SystemConfiguration -framework CFNetwork " \ "OTHER_LDFLAGS" => "-framework SystemConfiguration -framework CFNetwork " \
"-framework MobileCoreServices -l z.1.2.3" "-framework MobileCoreServices -l z.1.2.3"
...@@ -30,7 +30,7 @@ describe "Pod::Installer" do ...@@ -30,7 +30,7 @@ describe "Pod::Installer" do
["External/Reachability/*.h", "External/Reachability/*.m"], ["External/Reachability/*.h", "External/Reachability/*.m"],
"External/Reachability/*.{h,m}", "External/Reachability/*.{h,m}",
{ {
"USER_HEADER_SEARCH_PATHS" => "$(BUILT_PRODUCTS_DIR)", "USER_HEADER_SEARCH_PATHS" => "$(BUILT_PRODUCTS_DIR)/Pods",
"ALWAYS_SEARCH_USER_PATHS" => "YES" "ALWAYS_SEARCH_USER_PATHS" => "YES"
} }
], ],
...@@ -39,7 +39,7 @@ describe "Pod::Installer" do ...@@ -39,7 +39,7 @@ describe "Pod::Installer" do
['**/ASIWebPageRequest.*'], ['**/ASIWebPageRequest.*'],
"{Classes,Classes/ASIWebPageRequest,External/Reachability}/*.{h,m}", "{Classes,Classes/ASIWebPageRequest,External/Reachability}/*.{h,m}",
{ {
"USER_HEADER_SEARCH_PATHS" => "$(BUILT_PRODUCTS_DIR)", "USER_HEADER_SEARCH_PATHS" => "$(BUILT_PRODUCTS_DIR)/Pods",
"ALWAYS_SEARCH_USER_PATHS" => "YES", "ALWAYS_SEARCH_USER_PATHS" => "YES",
"HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2", "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2",
"OTHER_LDFLAGS" => "-l xml2.2.7.3 -framework SystemConfiguration " \ "OTHER_LDFLAGS" => "-l xml2.2.7.3 -framework SystemConfiguration " \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment