mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 13:57:29 +08:00
[shaderc] Add fix for installing shaderc_util (#18979)
* Added fix for installing shaderc_util in port shaderc. * Restricted install of shaderc_util to static build.
This commit is contained in:
parent
635361d801
commit
5ce620b6ba
18
ports/shaderc/fix-install-shaderc_util.patch
Normal file
18
ports/shaderc/fix-install-shaderc_util.patch
Normal file
@ -0,0 +1,18 @@
|
||||
diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
|
||||
index 99ce3c4..4926203 100644
|
||||
--- a/libshaderc_util/CMakeLists.txt
|
||||
+++ b/libshaderc_util/CMakeLists.txt
|
||||
@@ -49,6 +49,13 @@ target_link_libraries(shaderc_util PRIVATE
|
||||
glslang OSDependent OGLCompiler HLSL glslang SPIRV
|
||||
SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
|
||||
|
||||
+if(SHADERC_ENABLE_INSTALL AND NOT BUILD_SHARED_LIBS)
|
||||
+ install(TARGETS shaderc_util
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+endif(SHADERC_ENABLE_INSTALL)
|
||||
+
|
||||
shaderc_add_tests(
|
||||
TEST_PREFIX shaderc_util
|
||||
LINK_LIBS shaderc_util
|
@ -10,6 +10,7 @@ vcpkg_from_github(
|
||||
PATCHES
|
||||
disable-update-version.patch
|
||||
fix-build-type.patch
|
||||
fix-install-shaderc_util.patch
|
||||
)
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/build-version.inc DESTINATION ${SOURCE_PATH}/glslc/src)
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "shaderc",
|
||||
"version": "2021.1",
|
||||
"port-version": 1,
|
||||
"description": "A collection of tools, libraries and tests for shader compilation.",
|
||||
"homepage": "https://github.com/google/shaderc",
|
||||
"dependencies": [
|
||||
|
@ -5790,7 +5790,7 @@
|
||||
},
|
||||
"shaderc": {
|
||||
"baseline": "2021.1",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"shaderwriter": {
|
||||
"baseline": "1.1.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e8590ab232dd5ccd2331bb321127f00788b573a3",
|
||||
"version": "2021.1",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "2bf34bbfc26bddfe440bb115157a3b5cd07e7e79",
|
||||
"version": "2021.1",
|
||||
|
Loading…
Reference in New Issue
Block a user