| 123456789101112131415161718192021222324252627282930313233343536373839404142434445 |
- From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 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
- ---
- 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 acf6fb0..0f5d888 100644
- --- a/glslc/CMakeLists.txt
- +++ b/glslc/CMakeLists.txt
- @@ -18,7 +18,7 @@ add_library(glslc STATIC
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
- - HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
- + glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
-
- add_executable(glslc_exe src/main.cc)
- diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
- index 873540a..6d0c465 100644
- --- a/libshaderc_util/CMakeLists.txt
- +++ b/libshaderc_util/CMakeLists.txt
- @@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL)
-
- 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
|
