Add shader-compiler option and versions 1.0.6, 1.0.7 and 1.0.8

conan-io · Jul 31, 2023 · 6a681b9 · 6a681b9
1 parent a547bc7
commit 6a681b9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/recipes/vsg/all/conandata.yml b/recipes/vsg/all/conandata.yml
@@ -8,3 +8,13 @@ sources:
   "1.0.5":
     url: "https://github.com/vsg-dev/VulkanSceneGraph/archive/refs/tags/v1.0.5.tar.gz"
     sha256: "ff58260fcb88d19d92c40a70bc40ff06abb1a8805568eb76862a036d13ada75b"
+  "1.0.6":
+    url: "https://github.com/vsg-dev/VulkanSceneGraph/archive/refs/tags/v1.0.6.tar.gz"
+    sha256: "01c33a3699f7027590d4c7f5d44a6a472a7048d8ed0387d67e2a4a06b518b90f"
+  "1.0.7":
+    url: "https://github.com/vsg-dev/VulkanSceneGraph/archive/refs/tags/v1.0.7.tar.gz"
+    sha256: "c6a92495c5c267550927a0a980bb56fe6d3b584aa21a76f72461b1c003d4de08"
+  "1.0.8":
+    url: "https://github.com/vsg-dev/VulkanSceneGraph/archive/refs/tags/v1.0.8.tar.gz"
+    sha256: "0017cbb1c06b6c62c3ca2a222f083aecbc4ef0b6fc9b9e173cb8d3f005d13e62"
+
diff --git a/recipes/vsg/all/conanfile.py b/recipes/vsg/all/conanfile.py
@@ -20,11 +20,13 @@ class VsgConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
+        "shader_compiler": [True, False],
         "max_devices": [1,2,3,4],
         "fPIC": [True, False],
     }
     default_options = {
         "shared": False,
+        "shader_compiler": True,
         "max_devices" : 1,
         "fPIC": True,
     }
@@ -43,6 +45,8 @@ def _compilers_minimum_version(self):
     def config_options(self):
         if self.settings.os == "Windows":
             del self.options.fPIC
+        if self.version < "1.0.5":
+            self.options.shader_compiler = False
 
     def configure(self):
         if self.options.shared:
@@ -74,7 +78,7 @@ def generate(self):
         if is_msvc(self):
             tc.variables["USE_MSVC_RUNTIME_LIBRARY_DLL"] = False
         tc.variables["BUILD_SHARED_LIBS"] = self.options.shared
-        tc.variables["VSG_SUPPORTS_ShaderCompiler"] = 0
+        tc.variables["VSG_SUPPORTS_ShaderCompiler"] = 1 if self.options.shader_compiler else 0;
         tc.variables["VSG_MAX_DEVICES"] = self.options.max_devices
         tc.generate()
 

diff --git a/recipes/vsg/config.yml b/recipes/vsg/config.yml
@@ -1,4 +1,10 @@
 versions:
+  "1.0.8":
+    folder: all
+  "1.0.7":
+    folder: all
+  "1.0.6":
+    folder: all
   "1.0.5":
     folder: all
   "1.0.3":