Skip to content

Commit 77e3bcb

Browse files
committed
fix double require
1 parent 2e8a9f6 commit 77e3bcb

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

recipes/odrcore/all/conanfile.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,25 @@ def requirements(self):
5656
self.requires("uchardet/0.0.8")
5757
self.requires("utfcpp/4.0.4")
5858

59+
pdf2htmlEX_version = None
60+
wvWare_version = None
61+
5962
if self.options.get_safe("with_pdf2htmlEX"):
60-
self.requires("pdf2htmlex/0.18.8.rc1-20240905-git-vili")
63+
pdf2htmlEX_version = "0.18.8.rc1-20240905-git-vili"
6164
if self.options.get_safe("with_wvWare"):
62-
self.requires("wvware/1.2.9-vili")
65+
wvWare_version = "1.2.9-vili"
6366

6467
if Version(self.version) == "9.9.9":
6568
self.requires("cpp-httplib/0.16.3")
66-
self.requires("pdf2htmlex/0.18.8.rc1-odr-pr1")
67-
self.requires("wvware/1.2.9-odr")
69+
if self.options.get_safe("with_pdf2htmlEX"):
70+
pdf2htmlEX_version = "0.18.8.rc1-odr-pr1"
71+
if self.options.get_safe("with_wvWare"):
72+
wvWare_version = "1.2.9-odr"
73+
74+
if pdf2htmlEX_version is not None:
75+
self.requires(f"pdf2htmlEX/{pdf2htmlEX_version}")
76+
if wvWare_version is not None:
77+
self.requires(f"wvWare/{wvWare_version}")
6878

6979
def build_requirements(self):
7080
if Version(self.version) <= "2.0.0":

0 commit comments

Comments
 (0)