mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 03:34:26 +08:00
[spirv-reflect] Fix missing usage and include file (#38231)
<!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> Fixes https://github.com/microsoft/vcpkg/issues/29496 - Remove unnecessary dependencies: `spirv-headers`. - Add export for target `spirv-reflect-static`. - Install headers of the port and fix usage defects. Usage test passed with `x64-windows` triplet. - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] ~SHA512s are updated for each updated download.~ - [ ] ~The "supports" clause reflects platforms that may be fixed by this new version.~ - [ ] ~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~ - [ ] ~Any patches that are no longer applied are deleted from the port's directory.~ - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file.
This commit is contained in:
parent
31327a5b06
commit
4496d78eef
28
ports/spirv-reflect/export-targets.patch
Normal file
28
ports/spirv-reflect/export-targets.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 040c818..0e1476c 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -111,8 +111,20 @@ if(SPIRV_REFLECT_STATIC_LIB)
|
||||||
|
add_library(spirv-reflect-static STATIC ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.c)
|
||||||
|
|
||||||
|
- target_include_directories(spirv-reflect-static
|
||||||
|
- PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
- install(TARGETS spirv-reflect-static LIBRARY DESTINATION lib)
|
||||||
|
+ target_include_directories(spirv-reflect-static INTERFACE $<INSTALL_INTERFACE:include/spirv-reflect>)
|
||||||
|
+
|
||||||
|
+ set_target_properties(spirv-reflect-static PROPERTIES EXPORT_NAME spirv-reflect)
|
||||||
|
+
|
||||||
|
+ install(TARGETS spirv-reflect-static
|
||||||
|
+ EXPORT unofficial-spirv-reflect-config
|
||||||
|
+ LIBRARY DESTINATION lib)
|
||||||
|
+
|
||||||
|
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv/unified1/spirv.h DESTINATION include/spirv-reflect)
|
||||||
|
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h DESTINATION include/spirv-reflect)
|
||||||
|
+
|
||||||
|
+ install(EXPORT unofficial-spirv-reflect-config
|
||||||
|
+ FILE unofficial-spirv-reflect-config.cmake
|
||||||
|
+ NAMESPACE unofficial::
|
||||||
|
+ DESTINATION share/unofficial-spirv-reflect)
|
||||||
|
endif()
|
||||||
|
|
@ -5,21 +5,28 @@ vcpkg_from_github(
|
|||||||
REPO KhronosGroup/SPIRV-Reflect
|
REPO KhronosGroup/SPIRV-Reflect
|
||||||
REF "vulkan-sdk-${VERSION}"
|
REF "vulkan-sdk-${VERSION}"
|
||||||
SHA512 b09a9c6ea4fb28bf860026e0dd7a95db30c191da29a3fb936d80f9b95d1e1ac665e3a9a8941687eb4a8d1a85447209c718d310241d41c0779aef8d33851bc7ba
|
SHA512 b09a9c6ea4fb28bf860026e0dd7a95db30c191da29a3fb936d80f9b95d1e1ac665e3a9a8941687eb4a8d1a85447209c718d310241d41c0779aef8d33851bc7ba
|
||||||
HEAD_REF master
|
HEAD_REF main
|
||||||
|
PATCHES
|
||||||
|
export-targets.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_cmake_configure(
|
vcpkg_cmake_configure(
|
||||||
SOURCE_PATH "${SOURCE_PATH}"
|
SOURCE_PATH "${SOURCE_PATH}"
|
||||||
OPTIONS -DSPIRV_REFLECT_STATIC_LIB=ON
|
OPTIONS
|
||||||
|
-DSPIRV_REFLECT_STATIC_LIB=ON
|
||||||
|
-DSPIRV_REFLECT_EXAMPLES=OFF
|
||||||
|
-DSPIRV_REFLECT_BUILD_TESTS=OFF
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_cmake_install()
|
vcpkg_cmake_install()
|
||||||
|
|
||||||
|
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-spirv-reflect)
|
||||||
|
|
||||||
|
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/spirv-reflect/spirv_reflect.h" "./include/spirv/unified1/spirv.h" "spirv.h")
|
||||||
|
|
||||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||||
|
|
||||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||||
|
|
||||||
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
|
|
||||||
|
|
||||||
vcpkg_copy_tools(TOOL_NAMES spirv-reflect-pp spirv-reflect AUTO_CLEAN)
|
vcpkg_copy_tools(TOOL_NAMES spirv-reflect-pp spirv-reflect AUTO_CLEAN)
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "spirv-reflect",
|
"name": "spirv-reflect",
|
||||||
"version": "1.3.280.0",
|
"version": "1.3.280.0",
|
||||||
|
"port-version": 1,
|
||||||
"description": "SPIRV-Reflect is a lightweight library that provides a C/C++ reflection API for SPIR-V shader bytecode in Vulkan applications.",
|
"description": "SPIRV-Reflect is a lightweight library that provides a C/C++ reflection API for SPIR-V shader bytecode in Vulkan applications.",
|
||||||
"homepage": "https://github.com/KhronosGroup/SPIRV-Reflect",
|
"homepage": "https://github.com/KhronosGroup/SPIRV-Reflect",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"spirv-headers",
|
|
||||||
{
|
{
|
||||||
"name": "vcpkg-cmake",
|
"name": "vcpkg-cmake",
|
||||||
"host": true
|
"host": true
|
||||||
|
@ -8318,7 +8318,7 @@
|
|||||||
},
|
},
|
||||||
"spirv-reflect": {
|
"spirv-reflect": {
|
||||||
"baseline": "1.3.280.0",
|
"baseline": "1.3.280.0",
|
||||||
"port-version": 0
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"spirv-tools": {
|
"spirv-tools": {
|
||||||
"baseline": "1.3.280.0",
|
"baseline": "1.3.280.0",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "f5cfadd5ead0c5a5e825e2e21b314bc902a43261",
|
||||||
|
"version": "1.3.280.0",
|
||||||
|
"port-version": 1
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "dbbfffe0c147230e88f43f57d77b34c59f29b3f6",
|
"git-tree": "dbbfffe0c147230e88f43f57d77b34c59f29b3f6",
|
||||||
"version": "1.3.280.0",
|
"version": "1.3.280.0",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user