CREATE_PROJECT: Fix include order for cmake projects#6558
Merged
bluegr merged 1 commit intoscummvm:masterfrom Apr 25, 2025
Merged
CREATE_PROJECT: Fix include order for cmake projects#6558bluegr merged 1 commit intoscummvm:masterfrom
bluegr merged 1 commit intoscummvm:masterfrom
Conversation
If the engines directory contains plugins_table.h or detection_table.h from an in-source build, when building out-of-source, these files from the source directory were prioritized over build directory versions. This caused issues when different plugins were enabled across builds. The revised include order now matches the implementation in Makefile.
There was a problem hiding this comment.
Pull Request Overview
This PR fixes the include order in the CMake project configuration so that, during out-of-source builds, the correct versions of header files are used.
- Fixed the ordering of include directories by placing the current directory (.) at the beginning.
- Reordered the subsequent include paths to match the implementation from the Makefile.
Member
|
Copilot 🤦 |
Member
|
Do I understand correctly that the change consists of moving |
Contributor
Author
Exactly. Sorry for the mix. |
Member
|
Thanks! |
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.
If the engines directory contains plugins_table.h or detection_table.h from an in-source build, when building out-of-source, these files from the source directory were prioritized over build directory versions.
This caused issues when different plugins were enabled across builds.
The revised include order now matches the implementation in Makefile.