enable_gl_support at true by default

conan-io · Oct 6, 2024 · c7519bb · c7519bb
1 parent 1908cd5
commit c7519bb
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/recipes/openusd/all/conanfile.py b/recipes/openusd/all/conanfile.py
@@ -54,7 +54,7 @@ class OpenUSDConan(ConanFile):
         "build_embree_plugin": False,
         "enable_materialx_support": True,
         "enable_vulkan_support": False,
-        "enable_gl_support": False,
+        "enable_gl_support": True,
         "enable_ptex_support": True,
         "enable_openvdb_support": False,
         "build_alembic_plugin": False,
@@ -116,7 +116,7 @@ def configure(self):
             self.options.rm_safe("fPIC")
         # Set same options as in https://github.com/PixarAnimationStudios/OpenUSD/blob/release/build_scripts/build_usd.py#L1397
         # self.options["opensubdiv/*"].with_tbb = True
-        self.options["opensubdiv/*"].with_opengl = self.options.enable_gl_support and not is_apple_os(self)
+        self.options["opensubdiv/*"].with_opengl = self.options.enable_gl_support
         # FIXME: provokes a missing binary error on conan center
         self.options["opensubdiv/*"].with_metal = is_apple_os(self)
 
@@ -134,7 +134,8 @@ def requirements(self):
                 self.requires("openimageio/2.5.14.0")
             if not self.options.build_openimageio_plugin and self.options.build_opencolorio_plugin and self.options.build_gpu_support and self.options.enable_gl_support:
                 self.requires("opencolorio/2.3.2")
-            self.requires("opensubdiv/3.6.0")
+            if self.options.enable_gl_support:
+                self.requires("opensubdiv/3.6.0")
             if self.options.enable_vulkan_support:
                 self.requires("vulkan-headers/1.3.290.0")
             if self.options.enable_gl_support:
@@ -197,6 +198,7 @@ def generate(self):
         tc.variables["PXR_ENABLE_PYTHON_SUPPORT"] = self.options.enable_python_support
         tc.variables["PXR_BUILD_USD_TOOLS"] = self.options.build_usd_tools
 
+        # tc.variables["OPENSUBDIV_ROOT_DIR"] = self.dependencies['opensubdiv'].cpp_info.
         tc.variables["OPENSUBDIV_LIBRARIES"] = self.dependencies['opensubdiv'].cpp_info.libdirs[0].replace("\\", "/")
         # Provokes cmake parsing error
         # See https://c3i.jfrog.io/c3i/misc/logs/pr/24506/75-windows-visual_studio/openusd/24.08//a47d3be1b4a4ee7c129fc15ba3f28e471624adfb-build.txt