Cmake fixes ported from legacy ogre #474
Open
+309
−536
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
This is a port of commit 98563cb from ogre to ogre-next, with the following commands to complete it: git grep -l '${OGRE_SOURCE_DIR}' | xargs sed -i 's/${OGRE_SOURCE_DIR}/${PROJECT_SOURCE_DIR}/' git grep -l '${OGRE_BINARY_DIR}' | xargs sed -i 's/${OGRE_BINARY_DIR}/${PROJECT_BINARY_DIR}/' git grep -l '^PROJECT(' | xargs sed '/^PROJECT(/d' -i Signed-off-by: Maxim Cournoyer <[email protected]>
This is a partial port of the commit 3568f43cd5b1e246aec3f1347fc353f388885f1a from the ogre (not ogre-next) repository, omitting the zip header changes which doesn't apply. * MacroLogFeature: Clarify that even if a package is found it will not be used if a feature is disabled * Use list append on CMAKE_MODULE_PATH to allow prepending it with toolchain file, which is used with conan recipe.
This was referenced Nov 6, 2024
This ports commit 6de6f9b4081a07c911932441700c54b72ec1ee1f ("CMake:
Replace FindSDL2.cmake by sdl2-config.cmake (#1530)") from Ogre.
Remove the SDL2_INCLUDE_DIRS, since the new SDL2 imported target
automatically handles that.
Signed-off-by: Maxim Cournoyer <[email protected]>
|
Commit aecdaef9 does not pass CI on Windows. |
|
Thanks for the heads-up; any clue where I can find a failed Windows build log? |
eugenegff
force-pushed
the
master
branch
6 times, most recently
from
af29db0
to
6d574ab
Compare
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.
This improves things when using the FindOGRE.cmake module to locate Ogre-Next from the system, as reported here: #470 (comment)