From b832767940698a7dc7a347e8643edd717747787d Mon Sep 17 00:00:00 2001 From: Juan Ramos Date: Tue, 6 Feb 2024 20:18:21 -0700 Subject: Tests/FindVulkan: Update for glslang 12.3+ output Since 12.3.0 glslangValidator has been renamed to glslang. This fix maintains backcompat with older SDKs --- Tests/FindVulkan/Test/Run-glslangValidator.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Tests/FindVulkan/Test/Run-glslangValidator.cmake b/Tests/FindVulkan/Test/Run-glslangValidator.cmake index 27fd950..fd7867f 100644 --- a/Tests/FindVulkan/Test/Run-glslangValidator.cmake +++ b/Tests/FindVulkan/Test/Run-glslangValidator.cmake @@ -11,8 +11,10 @@ function(run_glslangValidator exe exe_display) message(SEND_ERROR "Result of ${exe_display} --help is ${result}, should be 1") endif() - if(NOT output MATCHES "^Usage: glslangValidator") - message(SEND_ERROR "Output of ${exe_display} --help is \"${output}\", should begin with \"Usage: glslangValidator\"") + # NOTE: Newer version prefer just "glslang" since it's no longer really just a validator. + # This approach is still compatible with older version that output glslangValidator + if(NOT output MATCHES "^Usage: glslang") + message(SEND_ERROR "Output of ${exe_display} --help is \"${output}\", should begin with \"Usage: glslang\"") endif() endfunction() -- cgit v0.12