bump vk-bootstrap to v1.3.296

recipes/vk-bootstrap/all/conandata.yml

@@ -1,30 +1,7 @@
 sources:
+  "1.3.296":
+    url: "https://github.com/charles-lunarg/vk-bootstrap/archive/refs/tags/v1.3.296.tar.gz"
+    sha256: "fbff2746134459648a488588a71609d11e6e00f591ac4a3cc6683a131bf31a53"
   "0.7":
     url: "https://github.com/charles-lunarg/vk-bootstrap/archive/refs/tags/v0.7.tar.gz"
     sha256: "7b2c30a4c46514cc5b20d2bebab25c495df39574b9e117c760d1cfe19f71d9aa"
-  "0.6":
-    url: "https://github.com/charles-lunarg/vk-bootstrap/archive/refs/tags/v0.6.tar.gz"
-    sha256: "95dedaa5cedf7a271f051d91b24b3b6c78aa3c5b2bc3cf058554c92748a421b2"
-  "0.5":
-    url: "https://github.com/charles-lunarg/vk-bootstrap/archive/refs/tags/v0.5.tar.gz"
-    sha256: "7ec1017d71d48595c078a4488140b230fd9cad1059986a18a507f356bf00e89b"
-  "0.4":
-    url: "https://github.com/charles-lunarg/vk-bootstrap/archive/refs/tags/v0.4.tar.gz"
-    sha256: "ba03449bb964d6cabbae3b6d6c8fce6e4276e4190885f9b5efc56153ef4b3c39"
-  "0.3.1":
-    url: "https://github.com/charles-lunarg/vk-bootstrap/archive/refs/tags/v0.3.1.tar.gz"
-    sha256: "bed3333c17acef9249a0095c070b80644d7f275d2479e7c07032fb9532704d70"
-  "0.2":
-    url: "https://github.com/charles-lunarg/vk-bootstrap/archive/v0.2.tar.gz"
-    sha256: "45afc9c2c90309f768786c8014913627e6f1cb4db20449a65b98283b58918483"
-patches:
-  "0.6":
-    - patch_file: "patches/0001-fix-cmake-0.6.patch"
-  "0.5":
-    - patch_file: "patches/0001-fix-cmake-0.5.patch"
-  "0.4":
-    - patch_file: "patches/0001-fix-cmake-0.4.patch"
-  "0.3.1":
-    - patch_file: "patches/0001-fix-cmake-0.3.1.patch"
-  "0.2":
-    - patch_file: "patches/0001-fix-cmake-0.2.patch"

recipes/vk-bootstrap/all/conanfile.py

@@ -1,8 +1,8 @@
 from conan import ConanFile
 from conan.errors import ConanInvalidConfiguration
 from conan.tools.build import check_min_cppstd, stdcpp_library
-from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
-from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get
+from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps, cmake_layout
+from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, replace_in_file, rm
 from conan.tools.microsoft import is_msvc
 from conan.tools.scm import Version
 import os
@@ -58,8 +58,8 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        if Version(self.version) < "0.7":
-            self.requires("vulkan-headers/1.3.236.0", transitive_headers=True)
+        if Version(self.version) > Version("1.0"):
+            self.requires(f"vulkan-headers/{self.version}.0", transitive_headers=True)
         else:
             self.requires("vulkan-headers/1.3.239.0", transitive_headers=True)
 
@@ -88,21 +88,21 @@ def source(self):
     def generate(self):
         tc = CMakeToolchain(self)
         tc.variables["VK_BOOTSTRAP_TEST"] = False
-        vulkan_headers = self.dependencies["vulkan-headers"]
-        includedirs = ";".join(
-            [os.path.join(vulkan_headers.package_folder, includedir).replace("\\", "/")
-             for includedir in vulkan_headers.cpp_info.includedirs],
-        )
-        if Version(self.version) < "0.3.0":
-            tc.variables["Vulkan_INCLUDE_DIR"] = includedirs
-        else:
+        tc.variables["VK_BOOTSTRAP_WERROR"] = False
+        if Version(self.version) < Version("1.0"):
+            vulkan_headers = self.dependencies["vulkan-headers"]
+            includedirs = ";".join(
+                [os.path.join(vulkan_headers.package_folder, includedir).replace("\\", "/")
+                for includedir in vulkan_headers.cpp_info.includedirs],
+            )
             tc.variables["VK_BOOTSTRAP_VULKAN_HEADER_DIR"] = includedirs
-        if Version(self.version) >= "0.4.0":
-            tc.variables["VK_BOOTSTRAP_WERROR"] = False
         tc.generate()
+        deps = CMakeDeps(self)
+        deps.generate()
 
     def build(self):
         apply_conandata_patches(self)
+        replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"), "add_library(vk-bootstrap STATIC", "add_library(vk-bootstrap", strict=False)
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
@@ -111,6 +111,7 @@ def package(self):
         copy(self, "LICENSE.txt", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
         cmake = CMake(self)
         cmake.install()
+        rm(self, "*", os.path.join(self.package_folder, "lib", "cmake"), recursive=True)
 
     def package_info(self):
         self.cpp_info.libs = ["vk-bootstrap"]

recipes/vk-bootstrap/all/test_package/CMakeLists.txt

@@ -5,4 +5,4 @@ find_package(vk-bootstrap REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
 target_link_libraries(${PROJECT_NAME} PRIVATE vk-bootstrap::vk-bootstrap)
-target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14)
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)

recipes/vk-bootstrap/config.yml

@@ -1,13 +1,5 @@
 versions:
-  "0.7":
-    folder: all
-  "0.6":
-    folder: all
-  "0.5":
-    folder: all
-  "0.4":
-    folder: all
-  "0.3.1":
-    folder: all
-  "0.2":
+  "1.3.296":
     folder: all
+  "0.7":
+    folder: all