| Patrick Williams | 7784c42 | 2022-11-17 07:29:11 -0600 | [diff] [blame^] | 1 | From 7f6c60f928dabd8b15aa948886523ddf15709215 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex@linutronix.de> |
| 3 | Date: Wed, 2 Nov 2022 15:42:58 +0100 |
| 4 | Subject: [PATCH] CMakeLists.txt: drop OSDependent/OGLCompiler from lists of |
| 5 | glslang libraries |
| 6 | |
| 7 | glslang no longer installs them separately, and all needed |
| 8 | functionality has been merged into glslang shared library itself: |
| 9 | |
| 10 | This wasn't a problem previously as they were still provided, |
| 11 | as static libraries but in latest glslang they no longer are: |
| 12 | https://github.com/KhronosGroup/glslang/commit/7cd519511c32d7e86d901c7ed231cb84c652d18d |
| 13 | |
| 14 | Upstream-Status: Submitted [https://github.com/google/shaderc/pull/1276] |
| 15 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 16 | --- |
| 17 | glslc/CMakeLists.txt | 2 +- |
| 18 | libshaderc/CMakeLists.txt | 2 +- |
| 19 | libshaderc/README.md | 4 ++-- |
| 20 | libshaderc_util/CMakeLists.txt | 2 +- |
| 21 | 4 files changed, 5 insertions(+), 5 deletions(-) |
| 22 | |
| 23 | diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt |
| 24 | index 31664d1..5093bd9 100644 |
| 25 | --- a/glslc/CMakeLists.txt |
| 26 | +++ b/glslc/CMakeLists.txt |
| 27 | @@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT) |
| 28 | endif(SHADERC_ENABLE_WGSL_OUTPUT) |
| 29 | |
| 30 | target_link_libraries(glslc PRIVATE |
| 31 | - glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries |
| 32 | + glslang HLSL glslang SPIRV # Glslang libraries |
| 33 | $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional |
| 34 | shaderc_util shaderc # internal Shaderc libraries |
| 35 | ${CMAKE_THREAD_LIBS_INIT}) |
| 36 | diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt |
| 37 | index 3ada419..d3542bf 100644 |
| 38 | --- a/libshaderc/CMakeLists.txt |
| 39 | +++ b/libshaderc/CMakeLists.txt |
| 40 | @@ -62,7 +62,7 @@ endif(SHADERC_ENABLE_INSTALL) |
| 41 | |
| 42 | find_package(Threads) |
| 43 | set(SHADERC_LIBS |
| 44 | - glslang OSDependent OGLCompiler glslang ${CMAKE_THREAD_LIBS_INIT} |
| 45 | + glslang glslang ${CMAKE_THREAD_LIBS_INIT} |
| 46 | shaderc_util |
| 47 | SPIRV # from glslang |
| 48 | SPIRV-Tools |
| 49 | diff --git a/libshaderc/README.md b/libshaderc/README.md |
| 50 | index bf9d317..1071769 100644 |
| 51 | --- a/libshaderc/README.md |
| 52 | +++ b/libshaderc/README.md |
| 53 | @@ -7,8 +7,8 @@ A library for compiling shader strings into SPIR-V. |
| 54 | There are two main shaderc libraries that are created during a CMake |
| 55 | compilation. The first is `libshaderc`, which is a static library |
| 56 | containing just the functionality exposed by libshaderc. It depends |
| 57 | -on other compilation targets `glslang`, `OSDependent`, `OGLCompiler`, |
| 58 | -`shaderc_util`, `SPIRV`, `HLSL`, `SPIRV-Tools`, and `SPIRV-Tools-opt`. |
| 59 | +on other compilation targets `glslang`, `shaderc_util`, `SPIRV`, |
| 60 | +`HLSL`, `SPIRV-Tools`, and `SPIRV-Tools-opt`. |
| 61 | |
| 62 | The other is `libshaderc_combined`, which is a static library containing |
| 63 | libshaderc and all of its dependencies. |
| 64 | diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt |
| 65 | index 99ce3c4..5291175 100644 |
| 66 | --- a/libshaderc_util/CMakeLists.txt |
| 67 | +++ b/libshaderc_util/CMakeLists.txt |
| 68 | @@ -46,7 +46,7 @@ add_definitions(-DENABLE_HLSL) |
| 69 | |
| 70 | find_package(Threads) |
| 71 | target_link_libraries(shaderc_util PRIVATE |
| 72 | - glslang OSDependent OGLCompiler HLSL glslang SPIRV |
| 73 | + glslang HLSL glslang SPIRV |
| 74 | SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) |
| 75 | |
| 76 | shaderc_add_tests( |