diff options
| author | Juan Ramos <juan.ramos@kitware.com> | 2024-02-07 03:18:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-02-07 15:04:04 (GMT) |
| commit | b832767940698a7dc7a347e8643edd717747787d (patch) | |
| tree | d4be632af72322bfd86116b207aef946d1ff5c39 | |
| parent | 28fc87e120a3a1dcd113a3ece36f0568c11da4b7 (diff) | |
| download | CMake-b832767940698a7dc7a347e8643edd717747787d.zip CMake-b832767940698a7dc7a347e8643edd717747787d.tar.gz CMake-b832767940698a7dc7a347e8643edd717747787d.tar.bz2 | |
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
| -rw-r--r-- | Tests/FindVulkan/Test/Run-glslangValidator.cmake | 6 |
1 files 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() |