| From 0b9468d4face34879214f500b15e810cdd1a81a1 Mon Sep 17 00:00:00 2001 |
| From: Niklas Haas <git@haasn.xyz> |
| Date: Tue, 29 May 2018 07:34:00 +0200 |
| Subject: [PATCH] Fix the link order of libglslang and libHLSL |
| |
| libglslang depends on libHLSL, so the latter needs to be specified last. |
| This fixes an issue when trying to build shaderc against system-wide |
| versions of libglslang/libHLSL, rather than the in-tree versions from |
| third_party. |
| |
| Additionally, libshaderc_util also depends on SPIRV-Tools |
| |
| Upstream-Status: Backport [21c8be385b3fab5edcb934a6d99f69fd389c4e67] |
| |
| Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
| |
| --- |
| glslc/CMakeLists.txt | 2 +- |
| libshaderc_util/CMakeLists.txt | 4 ++-- |
| 2 files changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt |
| index 31664d1..35b3f19 100644 |
| --- a/glslc/CMakeLists.txt |
| +++ b/glslc/CMakeLists.txt |
| @@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT) |
| endif(SHADERC_ENABLE_WGSL_OUTPUT) |
| |
| target_link_libraries(glslc PRIVATE |
| - glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries |
| + glslang OSDependent OGLCompiler glslang SPIRV HLSL # Glslang libraries |
| $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional |
| shaderc_util shaderc # internal Shaderc libraries |
| ${CMAKE_THREAD_LIBS_INIT}) |
| diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt |
| index 48f9991..984cc06 100644 |
| --- a/libshaderc_util/CMakeLists.txt |
| +++ b/libshaderc_util/CMakeLists.txt |
| @@ -46,8 +46,8 @@ add_definitions(-DENABLE_HLSL) |
| |
| find_package(Threads) |
| target_link_libraries(shaderc_util PRIVATE |
| - glslang OSDependent OGLCompiler HLSL glslang SPIRV |
| - SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) |
| + glslang OSDependent OGLCompiler glslang HLSL SPIRV |
| + SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT}) |
| |
| shaderc_add_tests( |
| TEST_PREFIX shaderc_util |