Skip to content

CMake: Guard inclusion of VULKAN_HEADERS and SPIRV-Headers #8124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
expipiplus1 merged 8 commits into from
Aug 19, 2025
Merged

CMake: Guard inclusion of VULKAN_HEADERS and SPIRV-Headers #8124

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cfd2dfe
Don't include VULKAN_HEADERS and SPIRV-Headers submodules if they are…
sergeiepopov Aug 8, 2025
3e7b735
Check for NOT TARGET instead of NOT DEFINED _SOURCE_DIR to avoide err…
sergeiepopov Aug 11, 2025
413f53d
Merge branch 'master' into cmake/guard_submodules_include
expipiplus1 Aug 12, 2025
2a37f31
format code
slangbot Aug 12, 2025
98ff3e1
Merge branch 'master' into cmake/guard_submodules_include
jkwak-work Aug 12, 2025
48b4f69
Merge pull request #1 from slangbot/format-8124-cmake/guard_submodule…
sergeiepopov Aug 13, 2025
801d9d3
Merge branch 'master' into cmake/guard_submodules_include
expipiplus1 Aug 15, 2025
1511c7d
Merge branch 'master' into cmake/guard_submodules_include
expipiplus1 Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,18 @@ if(NOT ${SLANG_USE_SYSTEM_LZ4})
endif()

# Vulkan headers
if(NOT ${SLANG_USE_SYSTEM_VULKAN_HEADERS})
if(NOT SLANG_OVERRIDE_VULKAN_HEADERS_PATH)
add_subdirectory(vulkan EXCLUDE_FROM_ALL ${system})
else()
add_subdirectory(
${SLANG_OVERRIDE_VULKAN_HEADERS_PATH}/vulkan
vulkan
EXCLUDE_FROM_ALL
${system}
)
if(NOT TARGET Vulkan::Headers)
if(NOT ${SLANG_USE_SYSTEM_VULKAN_HEADERS})
if(NOT SLANG_OVERRIDE_VULKAN_HEADERS_PATH)
add_subdirectory(vulkan EXCLUDE_FROM_ALL ${system})
else()
add_subdirectory(
${SLANG_OVERRIDE_VULKAN_HEADERS_PATH}/vulkan
vulkan
EXCLUDE_FROM_ALL
${system}
)
endif()
endif()
endif()

Expand All @@ -103,22 +105,24 @@ target_include_directories(
)

# SPIRV-Headers
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"
if(NOT TARGET SPIRV-Headers)
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"
)
Comment on lines +109 to +114
Copy link
Copy Markdown
Collaborator

@jkwak-work jkwak-work Aug 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be an error so that the user can fix it right away.

And from the naming perspective, "override" sounds like it could/should override SLANG_USE_SYSTEM_SPIRV_HEADERS; not the other way around.
But it wouldn't matter if it is an error and the build stops here.

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()
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)
Expand Down
Loading