From 45ca92c7863392e8b7c96ee6c34f346b0e39129f Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 6 Mar 2024 15:47:44 +0100 Subject: [PATCH] Revert "Nothing in the include folder, so don't copy for package." This reverts commit de26739b26825622240cbd119b1a507e80d0221a. --- conanfile.py | 2 +- include/folder.placeholder | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 include/folder.placeholder diff --git a/conanfile.py b/conanfile.py index f19d2e9..25c92bb 100644 --- a/conanfile.py +++ b/conanfile.py @@ -162,7 +162,7 @@ def package(self): copy(self, pattern = "*.h", - # NOTE: Right now there's nothing in the include folder, but if there is, it should be copied to the package folder here. (Including it now will cause the build to fail.) + dst = os.path.join(self.package_folder, "include"), # <- this should probably be removed? src = os.path.join(self.build_folder, "generated")) copy(self, pattern = "LICENSE*", diff --git a/include/folder.placeholder b/include/folder.placeholder new file mode 100644 index 0000000..b72dd87 --- /dev/null +++ b/include/folder.placeholder @@ -0,0 +1 @@ +probably the line copying over the 'include' folder in the package function of the conan-file should be removed instead of adding this, but I'm running out of time today