clean up submodule references#7656
Open
Goober5000 wants to merge 1 commit into
Open
Conversation
Goober5000
added
build
Goober5000
changed the title
Contributor
|
This might also be a good opportunity to look into switching to FectchContent for libRocket instead of it being a submodule. That would remove the last submodule and eliminate the initial submodule --init step. The main downside is that it would be grabbed during cmake's configure step. So while it would be much easier for new or infrequent devs to just clone the fs2open repo, configure, and build, it becomes a bit of an annoyance for core devs that use multiple build trees or clean them often. |
Vendor the CMake modules FSO actually used from the ~150-file rpavlik
submodule into cmake/, then drop the submodule:
- EnableExtraCompilerWarnings.cmake (toolchain warning flags)
- CreateLaunchers.cmake + its CleanDirectoryList.cmake dependency and
launcher-templates/ (IDE launcher generation for the game and FREDs)
- MSVCMultipleProcessCompile.cmake + its ListCombinations.cmake dependency
Also remove the dead cotire module-path entry and the vestigial
ENABLE_COTIRE option (cotire is never invoked and its directory no longer
exists), and repoint the submodule-initialized check at libRocket.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Goober5000
force-pushed
the
cleanup/rpavlik
branch
from
July 26, 2026 19:58
5509d64 to
5bbf00f
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
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.
Vendor the CMake modules FSO actually used from the ~150-file rpavlik
submodule into cmake/, then drop the submodule:
launcher-templates/ (IDE launcher generation for the game and FREDs)
Also remove the dead cotire module-path entry and the vestigial
ENABLE_COTIRE option (cotire is never invoked and its directory no longer
exists), and repoint the submodule-initialized check at libRocket.
Follow-up to #7646.