diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-08 14:44:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-08 14:45:02 (GMT) |
| commit | 504d33b603972aefbc4c79492684c1e7b3b4e88e (patch) | |
| tree | 737d56b69891bb6ba34e2d348311792c4c7010e4 /Tests | |
| parent | d97cded93e059593fab56bfaad39f075606f9184 (diff) | |
| parent | 49ebf18dd0f36519713241fc386a8c05077d0b11 (diff) | |
| download | CMake-504d33b603972aefbc4c79492684c1e7b3b4e88e.zip CMake-504d33b603972aefbc4c79492684c1e7b3b4e88e.tar.gz CMake-504d33b603972aefbc4c79492684c1e7b3b4e88e.tar.bz2 | |
Merge topic 'FindVulkan-glslang-14' into release-3.29
49ebf18dd0 FindVulkan: Update detection for glslang 14.0.0
9cefa2f08d Tests/FindVulkan: Allow easy way to switch between VulkanSDK installations
b832767940 Tests/FindVulkan: Update for glslang 12.3+ output
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9225
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/FindVulkan/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/FindVulkan/Test/Run-glslangValidator.cmake | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Tests/FindVulkan/CMakeLists.txt b/Tests/FindVulkan/CMakeLists.txt index 46ce1c6..d7c99ce 100644 --- a/Tests/FindVulkan/CMakeLists.txt +++ b/Tests/FindVulkan/CMakeLists.txt @@ -5,6 +5,7 @@ add_test(NAME FindVulkan.Test COMMAND "${CMake_BINARY_DIR}/Tests/FindVulkan/Test" ${build_generator_args} --build-project TestFindVulkan - --build-options ${build_options} + # Use --fresh to make testing multiple SDK versions on the same computer easier + --build-options ${build_options} --fresh --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION> ) 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() |