From f678acce983f09083e87b176ba5075b21d7bbaf5 Mon Sep 17 00:00:00 2001 From: Daniel Alm Date: Tue, 21 Feb 2017 18:31:13 +0100 Subject: [PATCH] Fix including xlsxwriter as a CocoaPod on macOS. Explanation for this change: Previously, CocoaPods would set up the framework target such that `xlsxwriter.h` would appear in the framework's main directory, alongside the `xlsxwriter` binary. It appears that the `codesign` utility only expects binaries in that directory, though, with all headers being in the `Headers` subdirectory (otherwise it fails with an `xlsxwriter.h: code object is not signed at all` message). This change modifies the header_mappings_dir to ensure that `xlsxwriter.h` is in `Headers`, with all other headers in `Headers/xlsxwriter`, and adjusts the paths in the module map accordingly. In addition, the umbrella header is modified to include Foundation rather than UIKit, as the former is sufficient to compile the module while the latter is not available on macOS. --- cocoapods/libxlsxwriter-umbrella.h | 2 +- cocoapods/libxlsxwriter.modulemap | 4 ++-- libxlsxwriter.podspec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cocoapods/libxlsxwriter-umbrella.h b/cocoapods/libxlsxwriter-umbrella.h index 7ee28f20..6503a63e 100644 --- a/cocoapods/libxlsxwriter-umbrella.h +++ b/cocoapods/libxlsxwriter-umbrella.h @@ -1,4 +1,4 @@ -#import +#import #import "../xlsxwriter.h" #import "app.h" diff --git a/cocoapods/libxlsxwriter.modulemap b/cocoapods/libxlsxwriter.modulemap index b42a0eb6..67bafc45 100644 --- a/cocoapods/libxlsxwriter.modulemap +++ b/cocoapods/libxlsxwriter.modulemap @@ -1,6 +1,6 @@ framework module xlsxwriter { - umbrella header "libxlsxwriter-umbrella.h" - header "../xlsxwriter.h" + umbrella header "xlsxwriter/libxlsxwriter-umbrella.h" + header "xlsxwriter.h" export * module * { export * } diff --git a/libxlsxwriter.podspec b/libxlsxwriter.podspec index fef81036..368302d5 100644 --- a/libxlsxwriter.podspec +++ b/libxlsxwriter.podspec @@ -37,7 +37,7 @@ Pod::Spec.new do |s| s.source_files = "src/**/*.c", "third_party/**/{zip.c,ioapi.c,tmpfileplus.c}", "include/**/*.h" s.header_dir = "xlsxwriter" - s.header_mappings_dir = "include/xlsxwriter" + s.header_mappings_dir = "include" s.library = "z" s.compiler_flags = "-DNOCRYPT=1", "-DNOUNCRYPT=1" s.pod_target_xcconfig = { 'USER_HEADER_SEARCH_PATHS' => '${PODS_ROOT}/libxlsxwriter/include' }