Skip to content

Commit 4c2f58d

Browse files
committed
Specify Doxygen version
1 parent fc68c66 commit 4c2f58d

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

conanfile.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# Gather here the various dependency versions, for convenience
1313
# (in alphabetic order)
1414
BOOST_VERSION = "1.88.0"
15+
DOXYGEN_VERSION = "1.14.0"
1516
EIGEN_VERSION = "5.0.0"
1617
EMBREE_VERSION = "4.3.3"
1718
FMT_VERSION = "12.0.0"
@@ -22,7 +23,6 @@
2223
JSON_VERSION = "3.12.0"
2324
LIBDEFLATE_VERSION = "1.23"
2425
LIBICONV_VERSION = "1.18"
25-
LLVM_OPENMP_VERSION = "17.0.6"
2626
MINIZIP_VERSION = "4.0.7"
2727
NINJA_VERSION = "1.13.1"
2828
NVRTC_VERSION = "12.8.93"
@@ -66,7 +66,7 @@ def requirements(self):
6666
override=True,
6767
libs=True,
6868
transitive_libs=True,
69-
) # For oidn
69+
)
7070
self.requires(
7171
f"libdeflate/{LIBDEFLATE_VERSION}",
7272
force=True,
@@ -138,21 +138,21 @@ def requirements(self):
138138
# Requires also doxygen's deps 'xapian' and 'libiconv', otherwise they
139139
# are downloaded at install in other versions, and that makes Doxygen
140140
# recompile
141-
self.requires(f"doxygen/[*]", build=False, run=True, visible=True)
142-
#self.requires(
143-
# f"xapian-core/{XAPIAN_CORE_VERSION}",
144-
# build=False,
145-
# run=False,
146-
# visible=True,
147-
# force=True,
148-
#)
149-
#self.requires(
150-
# f"libiconv/{LIBICONV_VERSION}",
151-
# build=False,
152-
# run=False,
153-
# visible=True,
154-
# force=True
155-
#)
141+
self.requires(f"doxygen/{DOXYGEN_VERSION}", build=False, run=True, visible=True)
142+
self.requires(
143+
f"xapian-core/{XAPIAN_CORE_VERSION}",
144+
build=False,
145+
run=False,
146+
visible=True,
147+
force=True,
148+
)
149+
self.requires(
150+
f"libiconv/{LIBICONV_VERSION}",
151+
build=False,
152+
run=False,
153+
visible=True,
154+
force=True
155+
)
156156

157157
def build_requirements(self):
158158
# LuxCoreDeps build requirements

0 commit comments

Comments
 (0)