Commit b7ad2cfb authored by Eloy Durán's avatar Eloy Durán

[Fix] Do not quote `$(inherited)`. Fixes #956.

parent fd8ac57e
...@@ -147,7 +147,7 @@ module Pod ...@@ -147,7 +147,7 @@ module Pod
# @todo Inheritance should be properly handled in Xcconfigs. # @todo Inheritance should be properly handled in Xcconfigs.
# #
DEVELOPER_FRAMEWORKS_SEARCH_PATHS = [ DEVELOPER_FRAMEWORKS_SEARCH_PATHS = [
'"$(inherited)"', '$(inherited)',
'"$(SDKROOT)/Developer/Library/Frameworks"', '"$(SDKROOT)/Developer/Library/Frameworks"',
'"$(DEVELOPER_LIBRARY_DIR)/Frameworks"' '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
] ]
......
...@@ -102,7 +102,7 @@ module Pod ...@@ -102,7 +102,7 @@ module Pod
spec.xcconfig = { 'OTHER_LDFLAGS' => '-no_compact_unwind' } spec.xcconfig = { 'OTHER_LDFLAGS' => '-no_compact_unwind' }
spec.frameworks = ['SenTestingKit'] spec.frameworks = ['SenTestingKit']
xcconfig = generator.generate xcconfig = generator.generate
xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should == '"$(inherited)" "$(SDKROOT)/Developer/Library/Frameworks" "$(DEVELOPER_LIBRARY_DIR)/Frameworks"' xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should == '$(inherited) "$(SDKROOT)/Developer/Library/Frameworks" "$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
end end
it "doesn't include the developer frameworks if already present" do it "doesn't include the developer frameworks if already present" do
...@@ -112,7 +112,7 @@ module Pod ...@@ -112,7 +112,7 @@ module Pod
generator = Generator::XCConfig.new(config.sandbox, [consumer_1, consumer_2], './Pods') generator = Generator::XCConfig.new(config.sandbox, [consumer_1, consumer_2], './Pods')
spec.frameworks = ['SenTestingKit'] spec.frameworks = ['SenTestingKit']
xcconfig = generator.generate xcconfig = generator.generate
xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should == '"$(inherited)" "$(SDKROOT)/Developer/Library/Frameworks" "$(DEVELOPER_LIBRARY_DIR)/Frameworks"' xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should == '$(inherited) "$(SDKROOT)/Developer/Library/Frameworks" "$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
end end
#-----------------------------------------------------------------------# #-----------------------------------------------------------------------#
......
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