Skip to content

Commit b1a8add

Browse files
committed
[Build] Update conan dependencies.
1 parent a438d30 commit b1a8add

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

build_scripts/linux/build-conan.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ BUILD_ROOT=${THIS_DIRECTORY}/../..
77
cd ${BUILD_ROOT}
88

99
conan remote add pierousseau https://api.bintray.com/conan/pierousseau/libs
10+
conan remote add mercseng https://api.bintray.com/conan/mercenariesengineering/conan_packages
1011

1112
function prebuild()
1213
{

conanfile.py

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,37 @@ class OpenEXRIdConan(ConanFile):
1717
generators = "cmake"
1818

1919
def requirements(self):
20-
self.requires("zlib/1.2.11")
21-
self.requires("libpng/1.6.37@pierousseau/stable")
20+
self.requires("zlib/1.2.11@mercseng/v0")
2221
self.requires("OpenFx/1.4@pierousseau/stable")
2322
if (self.settings.compiler == "Visual Studio" and self.settings.compiler.version == 10) or (self.settings.compiler == "gcc" and self.settings.compiler.version == 4.1):
23+
# Building for old Nukes
2424
self.requires("OpenImageIO/1.6.18@pierousseau/stable")
2525
self.requires("IlmBase/2.2.0@pierousseau/stable")
2626
self.requires("OpenEXR/2.2.0@pierousseau/stable")
2727
self.requires("re2/2016-02-01@pierousseau/stable")
28-
else:
28+
self.requires("libpng/1.6.37@pierousseau/stable")
29+
self.requires("boost/1.67.0@conan/stable")
30+
elif self.settings.os == "Linux":
31+
# Newer Nukes, Linux
2932
self.requires("OpenImageIO/2.1.15.0@mercseng/stable")
3033
self.requires("OpenEXR/2.5.1@mercseng/stable")
3134
self.requires("re2/2019-06-01@pierousseau/stable")
32-
33-
if self.settings.os == "Linux":
35+
self.requires("libpng/1.6.37@mercseng/v0")
3436
self.requires("boost/1.67.0@conan/stable")
3537
else:
36-
self.requires("boost/1.70.0")
38+
# Newer Nukes, Windows
39+
self.requires("OpenImageIO/2.1.15.0@mercseng/v2")
40+
self.requires("OpenEXR/2.5.1@mercseng/v0")
41+
self.requires("re2/2019-06-01@mercseng/v0")
42+
self.requires("libpng/1.6.37@mercseng/v0")
43+
self.requires("boost/1.73.0@mercseng/v2")
3744

3845
def configure(self):
3946
if self.settings.os == "Linux":
4047
# fPIC option exists only on linux
4148
self.options["boost"].fPIC=True
42-
self.options["IlmBase"].fPIC=True
49+
if self.settings.compiler == "gcc" and self.settings.compiler.version == 4.1:
50+
self.options["IlmBase"].fPIC=True
4351
self.options["OpenEXR"].fPIC=True
4452
#self.options["OpenFx"].fPIC=True
4553
self.options["OpenImageIO"].fPIC=True
@@ -49,6 +57,14 @@ def configure(self):
4957
if self.settings.compiler == "gcc" and self.settings.compiler.version == 4.1:
5058
self.options["libpng"].hardware_optimizations=False
5159

60+
if (self.settings.compiler == "Visual Studio" and self.settings.compiler.version == 10) or (self.settings.os == "Linux"):
61+
pass
62+
else:
63+
self.options["boost"].i18n_backend = "iconv"
64+
self.options["boost"].zstd = True
65+
self.options["boost"].lzma = True
66+
self.options["boost"].without_python = False
67+
self.options["cpython"].shared=True
5268

5369
def source(self):
5470
self.run("git clone http://github.com/MercenariesEngineering/openexrid.git --branch %s" % self.version)

0 commit comments

Comments
 (0)