From ebf664b7442197cfccbd5a6075c2c80af5946146 Mon Sep 17 00:00:00 2001 From: "Lvv.me" Date: Sun, 21 Nov 2021 21:57:55 +0800 Subject: [PATCH 1/2] Fix SPM warning: umbrella header for module 'libzstd' does not include header 'xxx.h' --- lib/modulemap/module.modulemap | 4 ++-- lib/modulemap/zstd-umbrella.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 lib/modulemap/zstd-umbrella.h diff --git a/lib/modulemap/module.modulemap b/lib/modulemap/module.modulemap index 5e09fca9e..2344fd947 100644 --- a/lib/modulemap/module.modulemap +++ b/lib/modulemap/module.modulemap @@ -1,4 +1,4 @@ -module libzstd { - umbrella header "../zstd.h" +module libzstd [extern_c] { + umbrella header "zstd-umbrella.h" export * } diff --git a/lib/modulemap/zstd-umbrella.h b/lib/modulemap/zstd-umbrella.h new file mode 100644 index 000000000..531e71254 --- /dev/null +++ b/lib/modulemap/zstd-umbrella.h @@ -0,0 +1 @@ +#include "../zstd.h" \ No newline at end of file From 944c71c07d21d4286bb8efdb1dc66517696aeafd Mon Sep 17 00:00:00 2001 From: "Lvv.me" Date: Wed, 24 Nov 2021 07:48:40 +0800 Subject: [PATCH 2/2] Remove zstd-umbrella.h --- lib/modulemap/module.modulemap | 2 +- lib/modulemap/zstd-umbrella.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 lib/modulemap/zstd-umbrella.h diff --git a/lib/modulemap/module.modulemap b/lib/modulemap/module.modulemap index 2344fd947..eeda69885 100644 --- a/lib/modulemap/module.modulemap +++ b/lib/modulemap/module.modulemap @@ -1,4 +1,4 @@ module libzstd [extern_c] { - umbrella header "zstd-umbrella.h" + header "../zstd.h" export * } diff --git a/lib/modulemap/zstd-umbrella.h b/lib/modulemap/zstd-umbrella.h deleted file mode 100644 index 531e71254..000000000 --- a/lib/modulemap/zstd-umbrella.h +++ /dev/null @@ -1 +0,0 @@ -#include "../zstd.h" \ No newline at end of file