Update cmake version to 3.30 qt to 6#1553
Merged
JonnyH merged 14 commits intoOpenApoc:masterfrom Sep 25, 2025
Merged
Conversation
We only really need it in the toplevel file
Pulls in (at least) the new find_package(Boost) stuff
Bumps the minimum cmake version past 3.5 (which is now removed) while not changing the api
DEPENDS never did anything Run the format post-build - it's what was happening anyway, so don't change behavior, and running format with other targets likely doesn't make much sense
Just pulls in a change to the minimum version
This *appears* harmless to enable on every platform, as then the OPENGL_glx_LIBRARY is just empty?
af51d43 to
e70319e
Compare
It seems the mirror vcpkg uses is down? And we don't *need* it for builds anyway?
5b325c4 to
e3765f8
Compare
qt5-15 was removed from appveyor, and as we don't actually use any qt5-specific features we can just move to qt6.
Looks like the RUNTIME_OUTPUT_DIRECTORY property is the "correct" way of doing this now, and the EXECUTABLE_OUTPUT_PATH global doesn't work with qt?
We really should always have the pdb, even on release builds
234cccf to
8a2c486
Compare
Collaborator
Author
|
Think this is ready to merge now (assuming CI success) |
Gives a chance of actually using them for debugging?
8a2c486 to
8b73fd5
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
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.
Does the "bare minimum" to pull up the minimum required cmake version
Choosing 3.30, as that pulls in the CMP0167 boost changes at least.
Also qt-5.15 has been removed from appveyor, so move to qt-6. This seemed to cause some differences to how the local built files pull in required plugins etc. so run windeployqt at build time on win32. Might also be required on macos, but no ability to test right now.