[DDA Port] Various improvements to CMake builds #3208
Merged
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
Cherry-picked from commit 35e3ee7
Cherry-picked from commit de1a6ccc325e0682983f3f19446822e4c8e5a514
* format cmake files to adhere to linting rules * cmake linting workflow/action Cherry-picked from a149ceb00807a323cd7eba5fa7a3a7c8b3b0b1b2
Cherry-picked from commit 84165ee535561773058130402510657b3621edf1
Cherry-picked from commit 7e588b20ec89abf6de6f674975f814803d9c5e7e
`PREFIX` is a reserved word in CMake and breaks compiler and library detection when set. Using `CMAKE_INSTALL_PREFIX` instead resolves this. Cherry-picked from commit: 7cbcecb18f3c9f91160a0ec45a04d61221096670
Cherry-picked from commit: db8f0d3de2f69c4b355afc9a6153da8abeb63f54
Cherry-picked from commit: 45f6a3b77fd07563a4625b1f313d2c4cb797db0d
Cherry-picked from commit ff4db050877c4cdcb9ae2e5b247eb4f70c1d3eb4
Cherry-picked from commit: 256ef3388407e66b9edaac91ef5993a89511fad7
Cherry-picked from commit: f9008b743357fd0eeed206437d284864783015a1
Cherry-picked from commit: 69a29a0c8ca772ba4ac7b27fefbc7fc48895258e
github-actions
bot
added
translation
src
Closed
scarf005
reviewed
Sep 23, 2023
Comment on lines
+1222
to
+1230
| ./CMakeLists.txt \ | ||
| ./data/CMakeLists.txt \ | ||
| ./lang/CMakeLists.txt \ | ||
| ./src/chkjson/CMakeLists.txt \ | ||
| ./src/CMakeLists.txt \ | ||
| ./src/version.cmake \ | ||
| ./tests/CMakeLists.txt \ | ||
| ./tools/clang-tidy-plugin/CMakeLists.txt \ | ||
| ./tools/format/CMakeLists.txt \ |
There was a problem hiding this comment.
They should be, or maybe even formatted with the deno formatting workflow somehow, but this was the fastest hack I could come up with.
scarf005
approved these changes
Sep 23, 2023
14 tasks
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.
Summary
SUMMARY: Build "[DDA Port] Various improvements to CMake builds"
Purpose of change
Working towards #3113
Describe the solution
DDA PRs ported, or used as base, or had commits cherry-picked from:
Also hacked in CMake style autofix workflow, dunno if it'd work.
We have a lot of divergences due to our own hacking of CMake build, some things may break.
Describe alternatives you've considered
Figuring out how to do cmake on windows and osx by my own.
Testing
The game builds and runs on linux...
There are more extensive changes to come, I don't think it's worth to test extensively yet.
I also don't have an OSX machine available at the moment, so OSX changes are picked "blindly".
Additional context
That style change PR is one big merge conflict :(