Skip to content

Commit 196cdc2

Browse files
committed
Fix cub recipe
1 parent 45eea1f commit 196cdc2

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

third_party/conan-recipes/cub/conanfile.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,20 @@ def validate(self):
5858

5959
def source(self):
6060
get(self, **self.conan_data["sources"][self.version], strip_root=True)
61+
62+
@property
63+
def _source_subfolder(self):
6164
if Version(self.version) >= "2.0":
62-
move_folder_contents(self, os.path.join(self.source_folder, "cub"), self.source_folder)
65+
return os.path.join(self.source_folder, "cub")
66+
return self.source_folder
6367

6468
def package(self):
6569
copy(self, "LICENSE.TXT",
6670
dst=os.path.join(self.package_folder, "licenses"),
67-
src=self.source_folder)
71+
src=self._source_subfolder)
6872
copy(self, "*.cuh",
6973
dst=os.path.join(self.package_folder, "include", "cub"),
70-
src=os.path.join(self.source_folder, "cub"))
74+
src=os.path.join(self._source_subfolder, "cub"))
7175

7276
def package_info(self):
7377
self.cpp_info.bindirs = []

0 commit comments

Comments
 (0)