Modern CMake Upgrade #481
Merged
Modern CMake Upgrade #481
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
git-subtree-dir: extern/discord-rpc git-subtree-split: c59fd6df20c6904ab39f026e87af1dd90fcac7ff
As of this commit, only linux can compile.
Travis-CI is not at the point where we can use it for Etterna CI. Though they are close to it. If OpenSSL could be preinstalled on Windows VM's, it would be possible to completely switch over to travis for CI/CD. The OpenSSL.light package within chocolatey only contains the DLL files, not the header files which are also needed by Etterna.
martensm
reviewed
Apr 10, 2019
WindowsResources.rc should be evaluated to see if it's actually necessary to have or there is a better way to accomplish the same thing.
Fission suggested that this segment of code required an explanation as to why it was there, and it's relationship to the CMake install function within .ci/build.sh. I agreed and added said explanation.
Changes were discussed within Etterna Dev Group discord server
This folder is genearted when the game is run. There is no need to keep any generated files within the repository.
The previous .gitignore was filled with a lot of lines which are useful only if the game was being built as an out-of-source build. While some parts of the codebase are still used out-of-source, the majority of the builds are contained within the Build directory. That isolation allows much of the .gitignore to be removed.
The previous one accidentally ignored the entire Etterna directory located in the src folder. This will only block the Etterna binary that gets generated in the root when building on unix.
This reverts commit 59766c3.
Previous commit was a mistake to commit. It was reverted and this commit takes it's place.
martensm
approved these changes
Apr 16, 2019
poco0317
reviewed
Apr 17, 2019
This file was removed to evaulate it's necessity. It was a heavy-handed removal being reversed in this commit, as this file gives the game it's error popup and executable icon. The file is still reliant on an unnecessary smzip.ico, and likely could be simplified and moved to a more suitable location.
poco0317
approved these changes
Apr 18, 2019
|
@poco0317 My testing for the |
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 is my sixth pull request on this repository.
Here is a summary of everything to be changed in this pull request.
Required before the merge
These first three are the hardest to track/keep separate in different commits, since the build system affects everything, and change one can also affect the others. The commit where each OS was able to build properly regardless of the other OS's also compiling is noted with the commit ID.
b38e2edaa507c22b4ef43aa1b011076d9c4dWindowsWill not be done this PR. Currently, Travis is not set up for this.f13eb2301ccfce4453d5b2e9240c9d26e51932f928b3ca40ImplementTo be added in different PR. Too much is done in this onecppcheck,link-what-you-use,clang-tidy,clang-formatwithin CMakeWindows-specific changes in PR
336bf3565815Other changes within PR
cmake-remakeWhile unrelated, a significant part of Update RageSurface_Save_JPEG to use stbi_write_jpg #489 is changing what is linked. Since it would no longer be linkable in it's the current state with the old CMake I will merge to update the CMake related files.c02ef9parallel_lights_io.dll.5b8334wldap32.libin libcurl4ecb34BYTE_ORDER,LITTLE_ENDIAN,BIG_ENDIAN.16870af65557d37f50