Mostly CMake stuff #106
Open
Mostly CMake stuff #106
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
I don't know if we're planning to have this ever be turned off, but at least the ambiguity between SDL & SDL_GFX is removed. Also, USE_SDLGFX is renamed to USE_SDL_GFX, to fit CMake's style. (Not worrying too much since currently -DUSE_SDLGFX doesn't build anyways.)
I have barely tested this, but it's better than no builds to test? Also, fun fact, launching this build on a fresh user data directory (no xm.db) corrupts the database because the version doesn't ever get written! Or something. I had to remove it anyhow while testing.
This module was added in CMake 3.14, but we can vendor it until the next Debian stable release.
If the build is using system libraries (for bzip2, lua, ode, or xdgbasedir), there's no need to add the corresponding subdirectories. This reduces build time and avoids potential mix-ups. Signed-off-by: Stephen Kitt <steve@sk2.org>
This commit switches over the following: + CURL (library, REQUIRED) + JPEG (library, REQUIRED) + Xml2 (library, REQUIRED) + PNG (library, REQUIRED) + SQLite3 (library, REQUIRED) + ZLIB (library, REQUIRED)
This commit switches over the following: + Intl (library, if(USE_GETTEXT) -> REQUIRED) + LibLZMA (libary, if(STATIC_BUILD)) + SDL (library, if(USE_SDL) -> REQUIRED) + SDL_gfx (library, if(USE_SDL) -> if(USE_SDL_gfx) -> REQUIRED) + SDL_mixer (library, if(USE_SDL) -> REQUIRED) + SDL_net (library, if(USE_SDL) -> REQUIRED) + SDL_ttf (library, if(USE_SDL) -> REQUIRED)
This commit switches over the following: + OpenGL (library, if(USE_OPENGL) -> REQUIRED)
This commit switches over the following: + BZip2 (library, system/vendor) + Lua (library, system/vendor) + ODE (library, system/vendor) + XDG (library, system/vendor) Additionally, the following are brought into style: + Chipmunk (library, vendor) + Md5sum (library, vendor) + Glad (generated) (library, vendor)
|
alright, looks like 3.13 is too much for Travis: so going through the documentation again to make sure everything's compatible will be fun. (how are they behind Debian stable?) EDIT: ah, it's an LTS behind (20.04 is latest) |
|
ugh, 3.13 added |
|
Thought: it's reasonable to ask for CMake from backports if you're a LTS behind on your distribution. |
Nikekson
approved these changes
Jul 29, 2020
There was a problem hiding this comment.
Reviewed 1 of 1 files at r1, 1 of 1 files at r2, 2 of 2 files at r3, 11 of 11 files at r4, 12 of 12 files at r5, 4 of 4 files at r6, 4 of 4 files at r7, 1 of 1 files at r8, 1 of 1 files at r9, 1 of 1 files at r10, 14 of 14 files at r11, 2 of 2 files at r12, 10 of 10 files at r13, 2 of 2 files at r14, 1 of 1 files at r15, 11 of 11 files at r16.
Reviewable status:complete! all files reviewed, all discussions resolved
This only worked on my system because of `if(NOT Intl_LIBRARY)`.
bb010g
force-pushed
the
nix
branch
8 times, most recently
from
b746cc8
to
ea87f5b
Compare
bb010g
force-pushed
the
nix
branch
3 times, most recently
from
03aeca7
to
885a7ee
Compare
|
Okay, fun facts from debugging Travis CI's CMake:
|
X-Moto allows certain libraries to be provided either by the system or X-Moto's source tree itself, as vendored dependencies. (Not all vendored dependencies may be provided by the system, such as Chipmunk.) These are called vendorable libraries here. With a USE_SYSTEM_* option ON, that vendorable library is system. With a USE_SYSTEM_* option OFF, that vendorable library may be either system or vendored. With the USE_SYSTEM option OFF, all USE_SYSTEM_* options are OFF. With the USE_SYSTEM option ON, all USE_SYSTEM_* options default ON. With a PREFER_SYSTEM_* option ON, that vendorable library is searched for and is system if found. With the PREFER_SYSTEM option ON, all PREFER_SYSTEM_* options default ON. With the PREFER_SYSTEM option OFF, all PREFER_SYSTEM_* options are OFF. With the USE_SYSTEM option OFF, the PREFER_SYSTEM option defaults ON. With the USE_SYSETM option ON, the PREFER_SYSTEM option is OFF. The upshot of all this is that USE_SYSTEM ON means libraries are explicitly either system or vendored, with failed system searches erroring instead of falling back to vendored, and both USE_SYSTEM & PREFER_SYSTEM OFF means all libraries are vendored. This should be good for maintainers?
Yes:
#include <lua.h>
No:
#include <lua/lua.h>
wheee Travis has CMake 3.12.4
bb010g
force-pushed
the
nix
branch
8 times, most recently
from
ff025e9
to
c715e45
Compare
|
SonarCloud Quality Gate failed.
|
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.
what if cmake was slightly less bad
Please review the individual commits first before trying to look at the whole change set.
This change is