diff options
| author | tarcila <tarcila@users.noreply.github.com> | 2019-03-10 23:31:43 -0400 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-03-10 20:31:43 -0700 |
| commit | 985957c395875be6a1b6e4770c37197296f53cb6 (patch) | |
| tree | 3019d5cc7141e6363fcdba605319095919be59eb | |
| parent | c247a7d21f5835d43b6eaa5507e1b34b6803c54c (diff) | |
| download | vcpkg-985957c395875be6a1b6e4770c37197296f53cb6.tar.gz vcpkg-985957c395875be6a1b6e4770c37197296f53cb6.zip | |
Fix shaderc compilation with clang (#5622)
Using a patch already integrated upstream.
| -rw-r--r-- | ports/shaderc/0001-Add-a-virtual-destructor.patch | 23 | ||||
| -rw-r--r-- | ports/shaderc/portfile.cmake | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/ports/shaderc/0001-Add-a-virtual-destructor.patch b/ports/shaderc/0001-Add-a-virtual-destructor.patch new file mode 100644 index 000000000..0fa695036 --- /dev/null +++ b/ports/shaderc/0001-Add-a-virtual-destructor.patch @@ -0,0 +1,23 @@ +From 563bc6e87a43c38b5495469307922c768edbd191 Mon Sep 17 00:00:00 2001 +From: neil <neil@codeplay.com> +Date: Thu, 1 Feb 2018 06:49:44 +0000 +Subject: [PATCH] Add a virtual destructor, otherwise Clang 6.0complains about + delete being called on an abstract class. + +--- + libshaderc/include/shaderc/shaderc.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libshaderc/include/shaderc/shaderc.hpp b/libshaderc/include/shaderc/shaderc.hpp +index 1c557431..335f0df9 100644 +--- a/libshaderc/include/shaderc/shaderc.hpp ++++ b/libshaderc/include/shaderc/shaderc.hpp +@@ -180,6 +180,8 @@ class CompileOptions { + + // Handles shaderc_include_result_release_fn callbacks. + virtual void ReleaseInclude(shaderc_include_result* data) = 0; ++ ++ virtual ~IncluderInterface() = default; + }; + + // Sets the includer instance for libshaderc to call during compilation, as diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake index c77110dbe..5f1f70572 100644 --- a/ports/shaderc/portfile.cmake +++ b/ports/shaderc/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 0001-Do-not-generate-build-version.inc.patch + 0001-Add-a-virtual-destructor.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/third_party/glslang) |