[bootstrap] Use official cmake configuration (#35643)

* [bootstrap] Use official cmake configuration

* version
This commit is contained in:
Frank 2023-12-14 15:28:56 +08:00 committed by GitHub
parent be2f582fae
commit 812e37be7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 34 deletions

View File

@ -6,22 +6,20 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO charles-lunarg/vk-bootstrap REPO charles-lunarg/vk-bootstrap
REF "v${VERSION}" REF "v${VERSION}"
SHA512 357ce69b080c6abcef7764652f5ab5e5fc744a9d0308bf457787f27c3c14a911480a7f9caf304ee92c33519bfbc977fb320fa3ef4a329716d0bd1b03135dd98e SHA512 c60567a5330908380efea8ac95036e63321fe1e2e72314068a5117c9c0f64cd8b80bd5e98eed9177f1f84dc4ee10a2a2dd902d111fc1a30f503287a7e4b22640
HEAD_REF master HEAD_REF master
) )
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
# This option will disable build tests and example, and next release this option need to change as -DVK_BOOTSTRAP_TEST=OFF. The related upstream commit: https://github.com/charles-lunarg/vk-bootstrap/commit/4ae9513ff9182b9c519504a73435ed575a821300. -DVK_BOOTSTRAP_TEST=OFF
-DCMAKE_PROJECT_NAME= -DVK_BOOTSTRAP_INSTALL=ON
) )
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
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") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")

View File

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

View File

@ -1,24 +0,0 @@
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 UNKNOWN IMPORTED)
set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include")
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()

View File

@ -8905,8 +8905,8 @@
"port-version": 0 "port-version": 0
}, },
"vk-bootstrap": { "vk-bootstrap": {
"baseline": "0.7", "baseline": "1.3.273",
"port-version": 1 "port-version": 0
}, },
"vkfft": { "vkfft": {
"baseline": "1.2.31", "baseline": "1.2.31",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "3daa2be00dbf53598e2e71dd9c96fddac37d0855",
"version": "1.3.273",
"port-version": 0
},
{ {
"git-tree": "ff20e17db240f974d3afaae76bcf2afbe96a068c", "git-tree": "ff20e17db240f974d3afaae76bcf2afbe96a068c",
"version": "0.7", "version": "0.7",