Move SPIRV into glslang#3837
Open
vikke1234 wants to merge 4 commits intoKhronosGroup:mainfrom
Open
Conversation
|
|
Author
|
I'll try to fix these ASAP, I'm in the middle of a move so might take a moment. Seems only a |
Contributor
|
This will fix part of #3509. Because the text of the original report got mangled when I edited it, I've lost track of whether this is the only remaining problem 3509 is about, but it's definitely one of the things it's about. |
In order to keep paths the same as post install, move the SPIRV to glslang.
Author
|
Hi, Sorry for the delay, should work now. |
jeremy-lunarg
requested changes
Feb 11, 2025
|
|
||
| if(ENABLE_SPIRV) | ||
| add_subdirectory(SPIRV) | ||
| add_subdirectory(glslang/SPIRV) |
Contributor
There was a problem hiding this comment.
Can you move this to glslang/CMakeLists.txt?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR moves the SPIRV/ into glslang/.
Currently, when using CMake's FetchContent1 to fetch SPIRV as a dependency, the headers are only generated upon installation. This results in inconsistent paths for including the headers. For example, if you use
FIND_PACKAGE_ARGSto first search for system packages and fall back to compiling from source, it complicates the compilation processA sample application that shows this behaviour can be found here: https://github.com/vikke1234/glslang-demo
The
masterbranch is the current behaviour, whilefixcantains this change.Footnotes
https://cmake.org/cmake/help/latest/module/FetchContent.html ↩