build: remove duplicate data directory installation in cmake#8112
Open
scarf005 wants to merge 1 commit intocataclysmbn:mainfrom
Open
build: remove duplicate data directory installation in cmake#8112scarf005 wants to merge 1 commit intocataclysmbn:mainfrom
scarf005 wants to merge 1 commit intocataclysmbn:mainfrom
Conversation
Collaborator
|
Happy to see that this should let us drop the bandaid fixes in the future, in particular for whenever next stable is made. For now, the CMake migration in the flatpak can (likely) go on thanks to bandaid fixes. |
a6a88f8 to
7e17b97
Compare
Instead of maintaining explicit list of subdirectories, copy entire data/ directory and exclude unwanted files (CMakeLists.txt, XDG/, READMEs).
b858944 to
5887869
Compare
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
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.
Purpose
CMake was installing data/ twice:
install(DIRECTORY data ...)Prerequisite for Flathub CMake migration.
Solution
Verification
Both modes work correctly.