[shaderwriter] Update to version 2.6.0. (#30521)

* [shaderwriter] Update to version 2.6.0.

* Now using vcpkg_check_features.
This commit is contained in:
Sylvain Doremus 2023-03-30 20:00:44 +01:00 committed by GitHub
parent e2bf878164
commit a2addd4bc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 6 deletions

View File

@ -4,14 +4,14 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
REPO DragonJoker/ShaderWriter
REF v${VERSION}
HEAD_REF development
SHA512 d87f5e2641b064b6d6c53c2af86ed3c133f76a408728f4ad4fbc122d4392b4da21fea3faa0b2f58391e348f23c972f3c0196386c5c8c66800500da99d4522f70
SHA512 7e7d5fec16998bf99225e01a990fcb29612eee8f59e32fbb4e9650a0d69ffc658588380fdfd9374cc5492bd4eac5c9c6dadeb583129c649e5d792346a2d1a743
)
vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH
REPO DragonJoker/CMakeUtils
REF 3bea3c21f76f49cd3730e555b32e9d401b542526
REF 7d355194fa795c437ce970cecf00e23ae10fc686
HEAD_REF master
SHA512 28c13672abe7a29e4c11192f3bbc10fd09d30f0719911370d7a1d70a534d41679feffafaad4ac1c1dd32403541ecf44b5021a1b8052418190dc040ed833ff15b
SHA512 ca25b19bdeb3e8fda7abc32f8548731f0ba1cd09889a70f6f287ad76d2fdfa0fedbb7f6f65b26d356ea51543bed8926c6bb463f8e8461b7d51d3b7b33134374c
)
file(REMOVE_RECURSE "${SOURCE_PATH}/CMake")
@ -19,6 +19,13 @@ file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake")
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
spirv SDW_BUILD_EXPORTER_SPIRV
glsl SDW_BUILD_EXPORTER_HLSL
hlsl SDW_BUILD_EXPORTER_GLSL
)
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
@ -29,6 +36,7 @@ vcpkg_cmake_configure(
-DSDW_BUILD_STATIC_SDW=${BUILD_STATIC}
-DSDW_BUILD_STATIC_SDAST=${BUILD_STATIC}
-DSDW_UNITY_BUILD=ON
${FEATURE_OPTIONS}
)
vcpkg_copy_pdbs()

View File

@ -1,6 +1,6 @@
{
"name": "shaderwriter",
"version": "2.5.0",
"version": "2.6.0",
"description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.",
"homepage": "https://github.com/DragonJoker/ShaderWriter",
"license": "MIT",
@ -13,5 +13,19 @@
"name": "vcpkg-cmake-config",
"host": true
}
]
],
"default-features": [
"spirv"
],
"features": {
"glsl": {
"description": "Compiles GLSL exporter."
},
"hlsl": {
"description": "Compiles HLSL exporter."
},
"spirv": {
"description": "Compiles SPIR-V exporter."
}
}
}

View File

@ -7253,7 +7253,7 @@
"port-version": 3
},
"shaderwriter": {
"baseline": "2.5.0",
"baseline": "2.6.0",
"port-version": 0
},
"shapelib": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ab41ceb262232d4ccc5cccbdba599f2f40d7a241",
"version": "2.6.0",
"port-version": 0
},
{
"git-tree": "d87eb1ff4e1e6208bb7be494740e5ab7ac8c9b83",
"version": "2.5.0",