(#16298) volk: add 1.3.239.0 + modernize more for conan v2

* add volk/1.3.239.0 * modernize more
conan-io · Mar 25, 2023 · 73068cb · 73068cb
1 parent 5d72a9a
commit 73068cb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/recipes/volk/all/conandata.yml b/recipes/volk/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "1.3.239.0":
+    url: "https://github.com/zeux/volk/archive/refs/tags/sdk-1.3.239.0.tar.gz"
+    sha256: "b628ae7d4e554c20763ac34e1fd18b87725c0c346e2a7106fa23701877bbac65"
   "1.3.236.0":
     url: "https://github.com/zeux/volk/archive/refs/tags/sdk-1.3.236.0.tar.gz"
     sha256: "fba21aeccd8df4ce49fd0cce54cc9b1808e24e4283cad733f65fdd52f1729f16"

diff --git a/recipes/volk/all/conanfile.py b/recipes/volk/all/conanfile.py
@@ -3,7 +3,7 @@
 from conan.tools.files import copy, get, replace_in_file, rmdir
 import os
 
-required_conan_version = ">=1.47.0"
+required_conan_version = ">=1.53.0"
 
 
 class VolkConan(ConanFile):
@@ -22,6 +22,7 @@ class VolkConan(ConanFile):
     )
     topics = ("vulkan", "loader", "extension", "entrypoint", "graphics")
 
+    package_type = "static-library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "fPIC": [True, False],
@@ -35,24 +36,17 @@ def config_options(self):
             del self.options.fPIC
 
     def configure(self):
-        try:
-            del self.settings.compiler.libcxx
-        except Exception:
-            pass
-        try:
-            del self.settings.compiler.cppstd
-        except Exception:
-            pass
+        self.settings.rm_safe("compiler.cppstd")
+        self.settings.rm_safe("compiler.libcxx")
 
     def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires(f"vulkan-headers/{self.version}")
+        self.requires(f"vulkan-headers/{self.version}", transitive_headers=True)
 
     def source(self):
-        get(self, **self.conan_data["sources"][self.version],
-            destination=self.source_folder, strip_root=True)
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
     def generate(self):
         tc = CMakeToolchain(self)

diff --git a/recipes/volk/config.yml b/recipes/volk/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.3.239.0":
+    folder: "all"
   "1.3.236.0":
     folder: "all"
   "1.3.231.1":