Fix CMake extract targets to not use absolute path for xml root#3330
Merged
briaguya0 merged 2 commits intoHarbourMasters:developfrom Oct 25, 2023
Merged
Fix CMake extract targets to not use absolute path for xml root#3330briaguya0 merged 2 commits intoHarbourMasters:developfrom
briaguya0 merged 2 commits intoHarbourMasters:developfrom
Conversation
briaguya0
approved these changes
Oct 25, 2023
Contributor
briaguya0
left a comment
There was a problem hiding this comment.
This specifically fixes an issue I was having because my working directory is /home/briaguya/code/Shipwright/
The code here https://github.com/HarbourMasters/ZAPDTR/blob/3d8a9c1efe15ad84bfca78a5a08a02489d8ed98c/ZAPD/ZResource.cpp#L345-L346
else if (StringHelper::Contains(xmlPath, "code/"))
prefix = "code";was leading to code being prefixed to assets that should not have it
Ideally we can get a fix for this into ZAPD so path checking logic only looks in the right spots, but this is good to have in here for now
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
2 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.
Use a relative path to the root xmls for the extract assets targets, and pass in the root for the xmls on the headers target
Build Artifacts