From 25b3ed12e3056b5322b19c7323bf1a718fb05ff6 Mon Sep 17 00:00:00 2001 From: Stephen White Date: Tue, 8 Feb 2022 15:32:00 +0000 Subject: [PATCH] Enable the Tint/GLSL backend in the CMake build. Don't build the Tint samples, because they require glslang. Change-Id: I04ac6bb313fa8926bd161b91488d30c2c26ebb67 Bug: dawn:1217 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/79660 Reviewed-by: Corentin Wallez Commit-Queue: Stephen White --- third_party/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index ab6ffab1e9..e8e1d26c67 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -52,10 +52,10 @@ endif() if (NOT TARGET libtint) message(STATUS "Dawn: using Tint at ${DAWN_TINT_DIR}") - # TODO(crbug.com/tint/1217): Tint expects glslang for validation when - # building the GLSL writer, but currently Dawn does not provide this - # third_party dependency. Disable the GLSL writer for now. - set(TINT_BUILD_GLSL_WRITER OFF) + set(TINT_BUILD_GLSL_WRITER ON) + # Don't build the samples because they require glslang and Dawn does not + # provide this third_party dependency. + set(TINT_BUILD_SAMPLES OFF) # TODO(crbug.com/tint/455): Tint does not currently build with CMake when # BUILD_SHARED_LIBS=1, so always build it as static for now. set(BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})