Skip to content

Rewrite the CocoaPods spec files, to declare the correct Public Headers for libwebp, fix the import issue when using use_frameworks #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 7, 2019
Merged

Rewrite the CocoaPods spec files, to declare the correct Public Headers for libwebp, fix the import issue when using use_frameworks #2

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
243ef8b
Rewrite the CocoaPods spec files, to declare the correct Public Heade…
dreampiggy Jun 11, 2019
32e2e90
Use `pod_target_xcconfig` instead of `xcconfig`, to avoid override th…
dreampiggy Jun 11, 2019
54129f7
update podspec to support all 4 standalone components, including `enc…
dreampiggy Jun 11, 2019
90d20c0
Fix the pod spec lint issue, change 4 components into 3, the `webp` s…
dreampiggy Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 9 additions & 41 deletions libwebp.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,48 +15,16 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = '9.0'
s.watchos.deployment_target = '2.0'

s.pod_target_xcconfig = {
'USER_HEADER_SEARCH_PATHS' => '$(inherited) ${PODS_ROOT}/libwebp/**'
s.xcconfig = {
'USER_HEADER_SEARCH_PATHS' => '$(inherited) ${PODS_ROOT}/libwebp/ ${PODS_TARGET_SRCROOT}/'
}
s.preserve_path = 'src'

s.subspec 'webp' do |ss|
ss.header_dir = 'webp'
ss.source_files = 'src/webp/*.h'
end
s.source_files = 'src/webp/*.{h,c}', 'src/utils/*.{h,c}', 'src/dsp/*.{h,c}', 'src/enc/*.{h,c}', 'src/dec/*.{h,c}', 'src/demux/*.{h,c}', 'src/mux/*.{h,c}'
s.public_header_files = 'src/webp/*.h'

s.subspec 'core' do |ss|
ss.source_files = [
'src/utils/*.{h,c}',
'src/dsp/*.{h,c}',
'src/enc/*.{h,c}',
'src/dec/*.{h,c}'
]
ss.dependency 'libwebp/webp'
end

s.subspec 'utils' do |ss|
ss.dependency 'libwebp/core'
end

s.subspec 'dsp' do |ss|
ss.dependency 'libwebp/core'
end

s.subspec 'enc' do |ss|
ss.dependency 'libwebp/core'
end

s.subspec 'dec' do |ss|
ss.dependency 'libwebp/core'
end

s.subspec 'demux' do |ss|
ss.source_files = 'src/demux/*.{h,c}'
ss.dependency 'libwebp/core'
end

s.subspec 'mux' do |ss|
ss.source_files = 'src/mux/*.{h,c}'
ss.dependency 'libwebp/core'
end
# fix #include <inttypes.h> cause 'Include of non-modular header inside framework module error'
s.prepare_command = <<-CMD
sed -i.bak 's/<inttypes.h>/<stdint.h>/g' './src/webp/types.h'
CMD
end