Skip to content

Commit 5a0dda4

Browse files
committed
Fix imports for Conan2
Fix imports for Conan2 5619216073dcb9297a4f22dbeb52a38cd8479eca
1 parent 8cd355b commit 5a0dda4

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

build/export_generators/cmake/conan_imports.jinja

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,29 @@
55
{%- set srcdir_and_mask = rsplit(search, ",", 2) -%}
66
{%- set srcdir = srcdir_and_mask[0]|trim -%}
77
{%- set mask = srcdir_and_mask[1]|trim -%}
8-
{%- if use_conan2 %}
9-
{{ shift }}copy(self, pattern="{{ mask }}", src=dep.cpp_info.bindirs[0], dst=self.build_folder + "../../../../{{ dstdir }}")
8+
{%- if use_conan2 -%}
9+
{%- if "bin" in srcdir %}
10+
for bindir in dep.cpp_info.bindirs:
11+
{{ shift }}copy(self, pattern="{{ mask }}", src=bindir, dst=self.build_folder + "../../../../{{ dstdir }}")
12+
{%- elif "res" in srcdir %}
13+
for resdir in dep.cpp_info.resdirs:
14+
{{ shift }}copy(self, pattern="{{ mask }}", src=resdir, dst=self.build_folder + "../../../../{{ dstdir }}")
15+
{%- elif "build" in srcdir %}
16+
for builddir in dep.cpp_info.builddirs:
17+
{{ shift }}copy(self, pattern="{{ mask }}", src=builddir, dst=self.build_folder + "../../../../{{ dstdir }}")
18+
{%- elif ("src" in srcdir) or ("source" in srcdir) %}
19+
for srcdir in dep.cpp_info.srcdirs:
20+
{{ shift }}copy(self, pattern="{{ mask }}", src=srcdir, dst=self.build_folder + "../../../../{{ dstdir }}")
21+
{%- elif "lib" in srcdir %}
22+
for libdir in dep.cpp_info.libdirs:
23+
{{ shift }}copy(self, pattern="{{ mask }}", src=libdir, dst=self.build_folder + "../../../../{{ dstdir }}")
24+
{%- elif "include" in srcdir %}
25+
for includedir in dep.cpp_info.includedirs:
26+
{{ shift }}copy(self, pattern="{{ mask }}", src=includedir, dst=self.build_folder + "../../../../{{ dstdir }}")
27+
{%- elif "frame" in srcdir %}
28+
for framedir in dep.cpp_info.frameworkdirs:
29+
{{ shift }}copy(self, pattern="{{ mask }}", src=framedir, dst=self.build_folder + "../../../../{{ dstdir }}")
30+
{%- endif -%}
1031
{%- else %}
1132
{{ shift }}self.copy(pattern="{{ mask }}", src="{{ srcdir }}", dst="{{ dstdir }}")
1233
{%- endif -%}

build/export_generators/cmake/conanfile.py.jinja

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ class App(ConanFile):
7575
{%- endfor %}
7676

7777
for dep in self.dependencies.values():
78-
if dep.cpp_info.bindirs:
7978
{%- if conan.imports|length -%}
8079
{%- set conan_imports = conan.imports -%}
8180
{%- set shift = "" -%}

0 commit comments

Comments
 (0)