From 7b5934635d48ae01b924eb12042024b61f21c226 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Wed, 1 Jan 2020 04:15:34 +0100 Subject: 20200101.1 global branch merge. Signed-off-by: Matteo Bernardini --- graphics/vulkan-sdk/glslang-revert.patch | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 graphics/vulkan-sdk/glslang-revert.patch (limited to 'graphics/vulkan-sdk/glslang-revert.patch') diff --git a/graphics/vulkan-sdk/glslang-revert.patch b/graphics/vulkan-sdk/glslang-revert.patch deleted file mode 100644 index e5a4759161..0000000000 --- a/graphics/vulkan-sdk/glslang-revert.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 199d115e1542fe0a8427efda5fa36158474fb6cf Mon Sep 17 00:00:00 2001 -From: John Kessenich -Date: Tue, 5 Nov 2019 18:05:42 -0700 -Subject: [PATCH] Fix #1959 by reverting 7b0e236 to put files in two places. - ---- - SPIRV/CMakeLists.txt | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - mode change 100644 => 100755 SPIRV/CMakeLists.txt - -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -old mode 100644 -new mode 100755 -index e25ec0a13..9869bafdc ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -90,9 +90,10 @@ if(ENABLE_GLSLANG_INSTALL) - install(TARGETS SPIRV EXPORT SPIRVTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() -- -- install(EXPORT SPVRemapperTargets DESTINATION lib/cmake) -- install(EXPORT SPIRVTargets DESTINATION lib/cmake) - -+ install(EXPORT SPVRemapperTargets DESTINATION lib/cmake) -+ install(EXPORT SPIRVTargets DESTINATION lib/cmake) -+ -+ install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/) - install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) - endif(ENABLE_GLSLANG_INSTALL) -- cgit v1.2.3