CMake: Don't include SPIRV-Cross except on Windows and macOS #11735
+7
−3
Conversation
This file contains 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
CMakeLists.txt
Outdated
| add_subdirectory(Externals/spirv_cross) | ||
| # SPIRV-Cross is used on Windows for GLSL to HLSL conversion for the Direct3D 11 and Direct3D 12 | ||
| # video backends, and on Apple devices for the Metal video backend. | ||
| if((CMAKE_SYSTEM_NAME STREQUAL "Windows") OR APPLE) |
There was a problem hiding this comment.
Maybe use WIN32 as a shorter alternative to CMAKE_SYSTEM_NAME STREQUAL "Windows"?
There was a problem hiding this comment.
Are these defined to be the same thing? If so I'll swap both uses.
There was a problem hiding this comment.
The documentation doesn't say it for sure, but it does say it also applies to 64-bit windows, which is good enough for me.
Building it on Linux is unnecessary as Direct3D and Metal are unavailable.
Pokechu22
force-pushed
the
cmake-no-spirv-cross-on-linux
branch
from
b9d5dfd
to
969d5e0
Compare
TellowKrinkle
approved these changes
Apr 7, 2023
lioncash
approved these changes
Apr 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Building it on Linux is unnecessary as Direct3D and Metal are unavailable.
These checks match the checks used in VideoBackends/CMakeLists.txt:
dolphin/Source/Core/VideoBackends/CMakeLists.txt
Lines 5 to 13 in d32e47c