diff --git a/ports/shaderc/fix-install-shaderc_util.patch b/ports/shaderc/fix-install-shaderc_util.patch new file mode 100644 index 00000000000000..7601f3020d3a57 --- /dev/null +++ b/ports/shaderc/fix-install-shaderc_util.patch @@ -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 diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake index 7d9596781ced99..be59aa5ba2a8c9 100644 --- a/ports/shaderc/portfile.cmake +++ b/ports/shaderc/portfile.cmake @@ -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) diff --git a/ports/shaderc/vcpkg.json b/ports/shaderc/vcpkg.json index 9d7b57a131ccc5..e7e490c008bfd3 100644 --- a/ports/shaderc/vcpkg.json +++ b/ports/shaderc/vcpkg.json @@ -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": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9a3c6efaa1c240..09379f360e7297 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5762,7 +5762,7 @@ }, "shaderc": { "baseline": "2021.1", - "port-version": 0 + "port-version": 1 }, "shaderwriter": { "baseline": "1.1.0", diff --git a/versions/s-/shaderc.json b/versions/s-/shaderc.json index 6a07dae4444c5e..8c608dcec57b5f 100644 --- a/versions/s-/shaderc.json +++ b/versions/s-/shaderc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8590ab232dd5ccd2331bb321127f00788b573a3", + "version": "2021.1", + "port-version": 1 + }, { "git-tree": "2bf34bbfc26bddfe440bb115157a3b5cd07e7e79", "version": "2021.1",