[vk-bootstrap] Fix CMake config for non-windows (#32330)

* [vk-bootstrap] Fix CMake config for non-windows

* [vk-bootstrap] Switch to vulkan-headers

* Simplify

ports/vk-bootstrap/portfile.cmake

@@ -1,4 +1,6 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -20,6 +22,6 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(COPY "${CMAKE_CURRENT_LIST_DIR}/${PORT}-config.cmake" "${CMAKE_CURRENT_LIST_DIR}/${PORT}-targets-release.cmake" "${CMAKE_CURRENT_LIST_DIR}/${PORT}-targets-debug.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/vk-bootstrap-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")

ports/vk-bootstrap/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "vk-bootstrap",
   "version": "0.7",
+  "port-version": 1,
   "description": "Vulkan bootstraping library",
   "homepage": "https://github.com/charles-lunarg/vk-bootstrap",
   "license": "MIT",
@@ -9,6 +10,6 @@
       "name": "vcpkg-cmake",
       "host": true
     },
-    "vulkan"
+    "vulkan-headers"
   ]
 }

ports/vk-bootstrap/vk-bootstrap-config.cmake

@@ -1,14 +1,24 @@
-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(NOT TARGET vk-bootstrap::vk-bootstrap)
+    get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+    get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+    get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
 
-add_library(vk-bootstrap::vk-bootstrap SHARED IMPORTED)
-set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
-)
+    add_library(vk-bootstrap::vk-bootstrap UNKNOWN IMPORTED)
+    set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include")
 
-get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-file(GLOB CONFIG_FILES "${_DIR}/vk-bootstrap-targets-*.cmake")
-foreach(f ${CONFIG_FILES})
-  include(${f})
-endforeach()
+    find_library(Z_VCPKG_VKBOOTSTRAP_LIBRARY_RELEASE NAMES vk-bootstrap PATHS "${_IMPORT_PREFIX}/lib" NO_DEFAULT_PATH REQUIRED)
+    set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release")
+    set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES IMPORTED_LOCATION_RELEASE "${Z_VCPKG_VKBOOTSTRAP_LIBRARY_RELEASE}")
+
+    find_library(Z_VCPKG_VKBOOTSTRAP_LIBRARY_DEBUG NAMES vk-bootstrap PATHS "${_IMPORT_PREFIX}/debug/lib" NO_DEFAULT_PATH)
+    if(Z_VCPKG_VKBOOTSTRAP_LIBRARY_DEBUG)
+        set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug")
+        set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES IMPORTED_LOCATION_DEBUG "${Z_VCPKG_VKBOOTSTRAP_LIBRARY_DEBUG}")
+    endif()
+
+    if(CMAKE_DL_LIBS)
+        set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS})
+    endif()
+
+    unset(_IMPORT_PREFIX)
+endif()

ports/vk-bootstrap/vk-bootstrap-targets-debug.cmake

@@ -1,12 +0,0 @@
-#----------------------------------------------------------------
-# Generated CMake target import file for configuration "Debug".
-#----------------------------------------------------------------
-
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES
-    IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/debug/lib/vk-bootstrap.lib"
-)
-
-set(CMAKE_IMPORT_FILE_VERSION)

ports/vk-bootstrap/vk-bootstrap-targets-release.cmake

@@ -1,12 +0,0 @@
-#----------------------------------------------------------------
-# Generated CMake target import file for configuration "Debug".
-#----------------------------------------------------------------
-
-set(CMAKE_IMPORT_FILE_VERSION 1)
-
-set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES
-    IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/vk-bootstrap.lib"
-)
-
-set(CMAKE_IMPORT_FILE_VERSION)

versions/baseline.json

@@ -8506,7 +8506,7 @@
     },
     "vk-bootstrap": {
       "baseline": "0.7",
-      "port-version": 0
+      "port-version": 1
     },
     "vkfft": {
       "baseline": "1.2.31",

versions/v-/vk-bootstrap.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ff20e17db240f974d3afaae76bcf2afbe96a068c",
+      "version": "0.7",
+      "port-version": 1
+    },
     {
       "git-tree": "76afd9e4fb4d1ac5c3329b5f2db845a3923d4aa6",
       "version": "0.7",