Skip to content

Fix osl 1.13 documentation build #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfpanisset merged 1 commit into from
Mar 13, 2026
+3 −6
Merged

Fix osl 1.13 documentation build #353

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions packages/conan/recipes/osl/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ def requirements(self):
self.requires("tsl-robin-map/1.2.1")
self.requires("oiio/[>=2.5]")
self.requires("imath/3.1.9", transitive_headers=True)
if Version(self.version) <= "1.13":
# OSL 1.13 has vestigial OpenEXR includes
self.requires("openexr/[>=3.0.0]")
self.requires("pugixml/[>=1.8]")
if self.options.with_partio:
self.requires("partio/[>=1.19.0]")
Expand Down Expand Up @@ -107,8 +104,8 @@ def generate(self):
tc.variables["USE_PYTHON"] = self.options.with_python
tc.variables["USE_QT"] = self.options.with_qt
tc.variables["OPTIXHOME"] = "/usr/local/NVIDIA-OptiX-SDK-9.0.0" # ASWF FIXME
if Version(self.version) <= "1.13":
tc.variables["INSTALL_DOCS"] = "OFF" # skip documentation build
if Version(self.version) < "1.14":
tc.variables["INSTALL_DOCS"] = "OFF" # skip documentation build for 1.13 and older

tc.generate()
cd = CMakeDeps(self)
Expand All @@ -118,7 +115,7 @@ def build(self):
apply_conandata_patches(self)
cmake = CMake(self)
cmake.configure()
cmake.build(cli_args=["--verbose"])
cmake.build()

def package(self):
# ASWF: license files in package subdirectory
Expand Down
Loading