Skip to content

Commit 1010bf6

Browse files
committed
Remove hard-coded versions for doxygen, xapian-core and libiconv
1 parent 1324a0b commit 1010bf6

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

conanfile.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# (in alphabetic order)
1414
BLENDER_VERSION = "4.2.3"
1515
BOOST_VERSION = "1.84.0"
16+
DOXYGEN_VERSION = "1.13.2"
1617
EIGEN_VERSION = "3.4.0"
1718
EMBREE3_VERSION = "3.13.5"
1819
FMT_VERSION = "11.0.2"
@@ -22,21 +23,22 @@
2223
IMGUIFILEDIALOG_VERSION = "0.6.7"
2324
JSON_VERSION = "3.11.3"
2425
LIBDEFLATE_VERSION = "1.22"
26+
LIBICONV_VERSION = "1.17"
2527
LLVM_OPENMP_VERSION = "17.0.6"
2628
MINIZIP_VERSION = "4.0.3"
2729
NINJA_VERSION = "1.12.1"
2830
NVRTC_VERSION = "12.8.61"
2931
OCIO_VERSION = "2.4.2"
32+
OIIO_VERSION = "2.5.18.0"
3033
OIDN_VERSION = "2.3.1"
31-
OIIO_VERSION = "2.5.16.0"
3234
OPENEXR_VERSION = "3.3.3"
33-
OIIO_VERSION = "2.5.18.0"
3435
OPENSUBDIV_VERSION = "3.6.0"
3536
OPENVDB_VERSION = "11.0.0"
3637
PYBIND11_VERSION = "2.13.6"
3738
ROBINHOOD_VERSION = "3.11.5"
3839
SPDLOG_VERSION = "1.15.0"
3940
TBB_VERSION = "2021.12.0"
41+
XAPIAN_CORE_VERSION = "1.4.19"
4042
ZSTD_VERSION = "1.5.7"
4143

4244

@@ -119,7 +121,7 @@ def requirements(self):
119121

120122
# LuxCore build requirements
121123
# As they are build requirements for LuxCore, they must be full
122-
# requirements for LuxCoreDeps (otherwise it won't get saved in cache)
124+
# requirements for LuxCoreDeps (otherwise they won't get saved in cache)
123125

124126
# Bison/flex (Luxcore build requirement)
125127
if self.settings.os == "Windows":
@@ -129,12 +131,12 @@ def requirements(self):
129131
self.requires("flex/[*]", build=False, run=True, visible=True)
130132

131133
# Ninja (Luxcore build requirement)
132-
self.requires(f"ninja/[*]", build=False, run=True, visible=True)
134+
self.requires("ninja/[*]", build=False, run=True, visible=True)
133135

134136
# Doxygen (Luxcore build requirement)
135-
self.requires(f"doxygen/1.13.2", build=False, run=True, visible=True)
136-
self.requires(f"xapian-core/1.4.19", build=False, run=False, visible=True)
137-
self.requires(f"libiconv/1.17", build=False, run=False, visible=True)
137+
self.requires(f"doxygen/{DOXYGEN_VERSION}", build=False, run=True, visible=True)
138+
self.requires(f"xapian-core/{XAPIAN_CORE_VERSION}", build=False, run=False, visible=True)
139+
self.requires(f"libiconv/{LIBICONV_VERSION}", build=False, run=False, visible=True)
138140

139141
def build_requirements(self):
140142
# LuxCoreDeps build requirements

0 commit comments

Comments
 (0)