Revert "Nothing in the include folder, so don't copy for package."

This reverts commit de26739.
Ultimaker · Mar 6, 2024 · 45ca92c · 45ca92c
1 parent de26739
commit 45ca92c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -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