From 9cfdf5de6b867ca7a95b3a74f30471cbe7c87494 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Sat, 26 Jul 2025 02:00:33 +0800 Subject: Fix SLANG_USE_SYSTEM_SPIRV_HEADERS=TRUE (#7916) find_package is locally scoped, so like other find_packages we should do it at the top level Closes https://github.com/shader-slang/slang/issues/7643 --- external/CMakeLists.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'external') diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 801cae4d6..029966b29 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -103,17 +103,22 @@ target_include_directories( ) # SPIRV-Headers -if(${SLANG_USE_SYSTEM_SPIRV_HEADERS}) - find_package(SPIRV-Headers REQUIRED) -elseif(NOT SLANG_OVERRIDE_SPIRV_HEADERS_PATH) - add_subdirectory(spirv-headers EXCLUDE_FROM_ALL ${system}) -else() +if(SLANG_USE_SYSTEM_SPIRV_HEADERS) + if(SLANG_OVERRIDE_SPIRV_HEADERS_PATH) + message( + WARNING + "SLANG_OVERRIDE_SPIRV_HEADERS_PATH does nothing when SLANG_USE_SPIRV_HEADERS is set" + ) + endif() +elseif(SLANG_OVERRIDE_SPIRV_HEADERS_PATH) add_subdirectory( ${SLANG_OVERRIDE_SPIRV_HEADERS_PATH}/spirv-headers spirv-headers EXCLUDE_FROM_ALL ${system} ) +else() + add_subdirectory(spirv-headers EXCLUDE_FROM_ALL ${system}) endif() if(SLANG_ENABLE_SLANG_GLSLANG) -- cgit v1.2.3