File tree Expand file tree Collapse file tree 1 file changed +3
-6
lines changed
packages/conan/recipes/osl Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -64,9 +64,6 @@ def requirements(self):
6464 self .requires ("tsl-robin-map/1.2.1" )
6565 self .requires ("oiio/[>=2.5]" )
6666 self .requires ("imath/3.1.9" , transitive_headers = True )
67- if Version (self .version ) <= "1.13" :
68- # OSL 1.13 has vestigial OpenEXR includes
69- self .requires ("openexr/[>=3.0.0]" )
7067 self .requires ("pugixml/[>=1.8]" )
7168 if self .options .with_partio :
7269 self .requires ("partio/[>=1.19.0]" )
@@ -107,8 +104,8 @@ def generate(self):
107104 tc .variables ["USE_PYTHON" ] = self .options .with_python
108105 tc .variables ["USE_QT" ] = self .options .with_qt
109106 tc .variables ["OPTIXHOME" ] = "/usr/local/NVIDIA-OptiX-SDK-9.0.0" # ASWF FIXME
110- if Version (self .version ) <= "1.13 " :
111- tc .variables ["INSTALL_DOCS" ] = "OFF" # skip documentation build
107+ if Version (self .version ) < "1.14 " :
108+ tc .variables ["INSTALL_DOCS" ] = "OFF" # skip documentation build for 1.13 and older
112109
113110 tc .generate ()
114111 cd = CMakeDeps (self )
@@ -118,7 +115,7 @@ def build(self):
118115 apply_conandata_patches (self )
119116 cmake = CMake (self )
120117 cmake .configure ()
121- cmake .build (cli_args = [ "--verbose" ] )
118+ cmake .build ()
122119
123120 def package (self ):
124121 # ASWF: license files in package subdirectory
You can’t perform that action at this time.
0 commit comments