Skip to content

Commit

Permalink
Update requirements.
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Christiansen authored and wdolinar committed Jan 28, 2022
1 parent c212838 commit b47dd2a
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,18 +205,11 @@ def export(self):

def requirements(self):
"""Requirements"""
if self.settings.compiler == 'Visual Studio' and 'MD' in str(self.settings.compiler.runtime):
self.requires("boost/1.74.0@aquaveo/testing") # Use legacy wchar_t setting for XMS.
else:
self.requires("boost/1.74.0@aquaveo/stable")
self.requires("boost/1.74.0.3@aquaveo/stable")

if self.options.pybind:
self.requires("pybind11/2.5.0@aquaveo/testing")

self.requires("xmscore/4.0.2@aquaveo/stable")
self.requires("xmsgrid/5.4.2@aquaveo/stable")
self.requires("xmsinterp/4.1.0@aquaveo/stable")
# zlib and bzip2 are required by boost. They used to get pulled automatically from conan-center, but something
# changed and we now need to explicitly list them as requirements using the new style notation.
self.requires('zlib/1.2.11')
self.requires('bzip2/1.0.8')
self.requires("xmscore/5.0.1@aquaveo/stable")
self.requires("xmsgrid/6.0.0@aquaveo/stable")
self.requires("xmsinterp/5.0.0@aquaveo/stable")

0 comments on commit b47dd2a

Please sign in to comment.