Skip to content

Commit dbfef93

Browse files
ljamtLevi
andauthored
Resolve zlib conflict (#35)
Co-authored-by: Levi <[email protected]>
1 parent 6ff9b45 commit dbfef93

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

conanfile.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ class LibCosimCConan(ConanFile):
1616
settings = "os", "compiler", "build_type", "arch"
1717
generators = "cmake", "virtualrunenv"
1818
requires = (
19-
"libcosim/0.9.0@osp/stable"
19+
"libcosim/0.9.0@osp/stable",
20+
# conflict resolution
21+
"zlib/1.2.12"
2022
)
2123

2224
def set_version(self):

0 commit comments

Comments
 (0)