commit 4759145c009e50f09fb27e0992ae8b282c15b45e
author Antonio Maiorano <amaiorano@google.com> Thu Oct 19 16:09:04 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 19 16:09:04 2023 +0000
tree ef4dd0ab62ca9e491ab4b950f7d4c1a9cef83e00
parent 2e149f4d848ec2986505ee5624a20afdd5323850

tint/cmake: fix TINT_BUILD_GLSL_VALIDATOR when !TINT_BUILD_GLSL_WRITER

Fixes missing include file 'glslang/Public/ResourceLimits.h' when
compiling glsl\validate\validate.cc.

Change-Id: I982de78381298b4e92773f38a2a42e4338bca4ce
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/156982
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>

src/tint/externals.json

diff --git a/src/tint/externals.json b/src/tint/externals.json
index 6cdd1b2..a7631a5 100644
--- a/src/tint/externals.json
+++ b/src/tint/externals.json
@@ -46,13 +46,13 @@
         "IncludePatterns": [
             "glslang/Public/ShaderLang.h"
         ],
-        "Condition": "tint_build_glsl_writer",
+        "Condition": "tint_build_glsl_validator",
     },
     "glslang-res-limits": {
         "IncludePatterns": [
             "glslang/Public/ResourceLimits.h"
         ],
-        "Condition": "tint_build_glsl_writer",
+        "Condition": "tint_build_glsl_validator",
     },
     "gtest": {
         "IncludePatterns": [
@@ -66,4 +66,4 @@
         ],
         "Condition": "is_win",
     },
-}
+}
\ No newline at end of file

src/tint/lang/glsl/validate/BUILD.bazel

diff --git a/src/tint/lang/glsl/validate/BUILD.bazel b/src/tint/lang/glsl/validate/BUILD.bazel
index 9a40836..1c3f71a 100644
--- a/src/tint/lang/glsl/validate/BUILD.bazel
+++ b/src/tint/lang/glsl/validate/BUILD.bazel
@@ -57,7 +57,7 @@
     "//src/tint/utils/text",
     "//src/tint/utils/traits",
   ] + select({
-    ":tint_build_glsl_writer": [
+    ":tint_build_glsl_validator": [
       
       
     ],
@@ -72,8 +72,3 @@
   actual = "//src/tint:tint_build_glsl_validator_true",
 )
 
-alias(
-  name = "tint_build_glsl_writer",
-  actual = "//src/tint:tint_build_glsl_writer_true",
-)
-

src/tint/lang/glsl/validate/BUILD.cmake

diff --git a/src/tint/lang/glsl/validate/BUILD.cmake b/src/tint/lang/glsl/validate/BUILD.cmake
index ce1aaed..51a2a16 100644
--- a/src/tint/lang/glsl/validate/BUILD.cmake
+++ b/src/tint/lang/glsl/validate/BUILD.cmake
@@ -59,11 +59,11 @@
   tint_utils_traits
 )
 
-if(TINT_BUILD_GLSL_WRITER)
+if(TINT_BUILD_GLSL_VALIDATOR)
   tint_target_add_external_dependencies(tint_lang_glsl_validate lib
     "glslang"
     "glslang-res-limits"
   )
-endif(TINT_BUILD_GLSL_WRITER)
+endif(TINT_BUILD_GLSL_VALIDATOR)
 
 endif(TINT_BUILD_GLSL_VALIDATOR)
\ No newline at end of file

src/tint/lang/glsl/validate/BUILD.gn

diff --git a/src/tint/lang/glsl/validate/BUILD.gn b/src/tint/lang/glsl/validate/BUILD.gn
index 9006a48..021b4b3 100644
--- a/src/tint/lang/glsl/validate/BUILD.gn
+++ b/src/tint/lang/glsl/validate/BUILD.gn
@@ -57,7 +57,7 @@
       "${tint_src_dir}/utils/traits",
     ]
 
-    if (tint_build_glsl_writer) {
+    if (tint_build_glsl_validator) {
       deps += [
         "${tint_glslang_dir}:glslang_default_resource_limits_sources",
         "${tint_glslang_dir}:glslang_lib_sources",

third_party/CMakeLists.txt

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index ae66401..a77d376 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -82,7 +82,7 @@
     add_subdirectory(${DAWN_SPIRV_TOOLS_DIR} "${CMAKE_CURRENT_BINARY_DIR}/spirv-tools" EXCLUDE_FROM_ALL)
 endif()
 
-if(NOT TARGET glslang AND ${TINT_BUILD_GLSL_WRITER} AND ${TINT_BUILD_CMD_TOOLS})
+if(NOT TARGET glslang AND (${TINT_BUILD_GLSL_WRITER} OR ${TINT_BUILD_GLSL_VALIDATOR}) AND ${TINT_BUILD_CMD_TOOLS})
     set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "" FORCE)
     add_subdirectory("${DAWN_THIRD_PARTY_DIR}/vulkan-deps/glslang/src" "${CMAKE_CURRENT_BINARY_DIR}/glslang" EXCLUDE_FROM_ALL)
 endif()