Fix Linux shader install path: copy contents instead of directory #2416
+1
−1
Conversation
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
CMake install(DIRECTORY "path") without a trailing slash copies the directory itself, creating an extra shaders_slang/ level under Shaders/. Adding a trailing slash makes it copy the contents directly, consistent with macOS (ditto) and Windows (copy_directory) which both copy contents. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Fix slang-shaders being installed in an extra subdirectory on Linux.
install(DIRECTORY "${slang_shaders_LOCATION}" ...)without a trailing slash copies the directory itself, creatingShaders/shaders_slang/instead of putting the shader files directly inShaders/.Adding a trailing slash (
"${slang_shaders_LOCATION}/") makes CMake copy the contents, which is consistent with macOS and Windows:ditto "${slang_shaders_LOCATION}" ".../Shaders/"copy_directory "${slang_shaders_LOCATION}" ".../Shaders/"install(DIRECTORY "${slang_shaders_LOCATION}" ...)install(DIRECTORY "${slang_shaders_LOCATION}/" ...)Change
One character added: a trailing
/indesktop-ui/cmake/os-linux.cmakeline 21.Test plan
Shaders/instead ofShaders/shaders_slang/