Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce CMake (and removing all other project-related code) #7270

Merged
merged 8 commits into from Jun 5, 2020

Conversation

@TrueBrain
Copy link
Member

@TrueBrain TrueBrain commented Feb 23, 2019

Fixes #6884
Fixes #7470

Stable release build
Nightly release build

This removes:

  • MSVC project files
  • Kdevelop generation files
  • configure / Makefile

It replaces them all with a single method: cmake. This should also remove any awk/vbs scripts we have around, meaning we will get a single method of doing stuff.

Currently tested with these 'IDEs':

  • VS2017 (yes, VS supports CMake)
  • VS2019 (yes, VS2019 supports CMake even better)
  • CMake, WSL Ubuntu 18.04

This is pretty much a Work In Progress, but I wanted to show others how it would look etc, so they can also test already a bit. Any feedback is welcome.

To test it out:

mkdir build
cd build
cmake ..
make

Or open the CMakeLists.txt in VS2017 / VS2019.

Things still to do:

  • Debian dependencies
  • rpm support
  • Linux install: menu entries
  • check if we are autodetecting everything
  • check all TODOs, and make sure they are fixed
  • validate this works on all current machines of all people that can compile OpenTTD now
  • validate this works on things like CLion, Visual Code Studio, Kdevelop, ..
  • rewrite Squirrel generation in CMake (done in a branch)
  • add the ability to make stable builds (NO_ASSERT, see MSVC changes for stable releases) via parameters
  • autodetect nforenum
  • autodetect grfcodec
  • add ICC support
  • add all the warning flags etc
  • add debug options
  • rewrite bundling code in CMake
  • rewrite baseset generation in CMake
  • rewrite regression in CMake
  • rewrite source.list in CMake
  • autodetect ICU
  • autodetect TiMiditity (libtimidity is no longer available on most OSes)
  • autodetect xdg-basedir
  • autodetect iconv
  • autodetect OSX stuff (Cocoa QuickDraw, Quartz, libraries, etc)
  • rewrite findversion in CMake (partially done here: LordAro@1ea407b)
    Currently it is calling findversion.sh, which only works on non-Windows. Porting it to CMake makes more sense (one single way of doing stuff).
  • add static builds (no static builds for now; we might reconsider later)
  • add CMake support for all CI targets
  • revisit dependencies for Dedicated Server (does it need SDL, Cocoa, ..)
  • fix CI for Linux targets
  • fix CI for Windows
  • fix CI for OSX
  • fix mingw
  • fix dedicated doesn't need a video driver
  • split CMakeLists.txt inside several files to increase readability
  • remove all old project files (including configure, Makefile, projects/, etc)
  • restore projects\os_versions.manifest usage in VS builds

(I am sure I am missing stuff .. but this is something to work on at least :D)

@TrueBrain TrueBrain force-pushed the TrueBrain:cmake branch from 2a97e01 to f6cd1ad Feb 23, 2019
CMakeLists.txt Outdated Show resolved Hide resolved
@nielsmh
Copy link
Contributor

@nielsmh nielsmh commented Feb 24, 2019

If CMake becomes the only (meta) build system, wouldn't it make sense to scrap the source.list file as well, and define that data via CMake syntax instead?

@TrueBrain TrueBrain force-pushed the TrueBrain:cmake branch from cfff2fc to a891bd6 Feb 24, 2019
@glx22
Copy link
Contributor

@glx22 glx22 commented Feb 24, 2019

For MinGW directmusic and xaudio2 needs to be detected. MinGW has directmusic headers, but doesn't have xaudio2.

@TrueBrain
Copy link
Member Author

@TrueBrain TrueBrain commented Feb 24, 2019

Added both @nielsmh and @glx22 points to the list at the top.

@orudge
Copy link
Contributor

@orudge orudge commented Feb 24, 2019

For MinGW directmusic and xaudio2 needs to be detected. MinGW has directmusic headers, but doesn't have xaudio2.

Just to clarify, if you manually copy over an xaudio2 header file then mingw should be happy with it - I did test that when I wrote it.

src/os/windows/ottdres.rc.in Outdated Show resolved Hide resolved
@glx22
Copy link
Contributor

@glx22 glx22 commented Feb 26, 2019

I kept the manifest in projects, but it should probably move somewhere else

@glx22
Copy link
Contributor

@glx22 glx22 commented Feb 27, 2019

For now we rely on cmake default CMAKE_CONFIGURATION_TYPES and CMAKE_XXXXX_FLAGS_<CONFIG>, but it should be better to manage that by ourselves

src/os/windows/ottdres.rc.in Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
@TrueBrain
Copy link
Member Author

@TrueBrain TrueBrain commented Feb 27, 2019

For now we rely on cmake default CMAKE_CONFIGURATION_TYPES and CMAKE_XXXXX_FLAGS_, but it should be better to manage that by ourselves

I disagree. The closer we stay to CMake, the easier our life will be. Let's try to do this, and only add exceptions if we really need to (and mark them as such). Otherwise we will have a config.lib in no time :D

@glx22
Copy link
Contributor

@glx22 glx22 commented Feb 27, 2019

Indeed something is wrong in the generated project file for lzo and lzma
AdditionalDependencies for Release:
D:\developpement\GitHub\vcpkg\installed\x64-windows-static\lib\libpng16.lib
D:\developpement\GitHub\vcpkg\installed\x64-windows-static\lib\zlib.lib
D:\developpement\GitHub\vcpkg\installed\x64-windows-static\debug\lib\lzma.lib
D:\developpement\GitHub\vcpkg\installed\x64-windows-static\debug\lib\lzo2.lib
D:\developpement\GitHub\vcpkg\installed\x64-windows-static\lib\freetype.lib
D:\developpement\GitHub\vcpkg\installed\x64-windows-static\lib\bz2.lib

AdditionalDependencies for Debug:
D:\developpement\GitHub\vcpkg\installed\x64-windows-static\debug\lib\libpng16d.lib
D:\developpement\GitHub\vcpkg\installed\x64-windows-static\debug\lib\zlibd.lib
D:\developpement\GitHub\vcpkg\installed\x64-windows-static\debug\lib\lzma.lib
D:\developpement\GitHub\vcpkg\installed\x64-windows-static\debug\lib\lzo2.lib
D:\developpement\GitHub\vcpkg\installed\x64-windows-static\debug\lib\freetyped.lib
D:\developpement\GitHub\vcpkg\installed\x64-windows-static\debug\lib\bz2d.lib

@glx22
Copy link
Contributor

@glx22 glx22 commented Mar 1, 2019

hmm that's weird, OSX cmake step now pass, lzo is found, compilation fails because it doesn't find an lzo header

@glx22
Copy link
Contributor

@glx22 glx22 commented Mar 1, 2019

Ok there's an issue with lzo detection, I can compile with MinGW by luck, as the detected

-- LZO_INCLUDE_DIRS:H:/msys64/mingw64/include/lzo

is covered by H:/msys64/mingw64/include from other libs.
But on OSX

-- LZO_INCLUDE_DIRS: /usr/local/Cellar/lzo/2.10/include/lzo

is alone

@TrueBrain TrueBrain force-pushed the TrueBrain:cmake branch 2 times, most recently from 6164e63 to a25c911 Mar 2, 2019
@glx22
Copy link
Contributor

@glx22 glx22 commented Mar 3, 2019

Stupid me failing in the commit message.

BTW I think test task for MacOS should probably be "make -C build test".

@TrueBrain TrueBrain force-pushed the TrueBrain:cmake branch 3 times, most recently from e5b7c05 to d71ac0a Mar 10, 2019
cmake/AutodetectSSE.cmake Outdated Show resolved Hide resolved
@glx22
Copy link
Contributor

@glx22 glx22 commented Mar 12, 2019

regression works with MinGW without converting the exe, but it fails with many

6: -  SetCommandDelay: (null : 0x00000000)
6: +  SetCommandDelay: (null : 0x0000000000000000)'

I guess the lovely regex was needed :)

@TrueBrain
Copy link
Member Author

@TrueBrain TrueBrain commented Mar 13, 2019

Yeah, but I refused to do that unreadable regex; so now I am just adding them one case at the time :D

@TrueBrain TrueBrain force-pushed the TrueBrain:cmake branch 5 times, most recently from 823f76d to 027a5b3 Mar 13, 2019
@glx22 glx22 force-pushed the TrueBrain:cmake branch 2 times, most recently from 123c004 to 4f2c6c4 May 17, 2020
@James103
Copy link
Contributor

@James103 James103 commented May 17, 2020

Conflicts still need to be resolved (media/baseset/translations.vbs) and there's still the Temp: debug output commit that needs rewording.

@glx22
Copy link
Contributor

@glx22 glx22 commented May 17, 2020

The Temp commit is here for a reason, and the conflict will go with the next rebase.

@fsimonis
Copy link
Contributor

@fsimonis fsimonis commented May 18, 2020

Hi, please check out TrueBrain#11 before you merge this PR.
The PR adds potential targets to the library detection and fixed an incompatibility with FindSDL.

@glx22 glx22 force-pushed the TrueBrain:cmake branch from 4f2c6c4 to cfde7d4 May 18, 2020
@glx22
Copy link
Contributor

@glx22 glx22 commented May 18, 2020

@fsimonis I implemented your PR when you first mentioned it :)

@glx22 glx22 force-pushed the TrueBrain:cmake branch from cfde7d4 to d711229 May 18, 2020
@nielsmh nielsmh dismissed LordAro’s stale review Jun 3, 2020

Looks like all the points have been adressed

Copy link
Contributor

@nielsmh nielsmh left a comment

I'm going to be radical and say we should get this merged :) Iron out the final kinks after we see it in production. Make sure we don't get any more PRs wanting to change things about the build system whose work would just have to be duplicated.

Well, of course there's a bunch of formal errors from the commit checker that need to be fixed, and some "conflicts".

TrueBrain added 8 commits Apr 7, 2019
This prepares for the switch to CMake, which takes over all current
exisiting forms of project files.
… script

The tst_stationlist savegame had to be changed to start the correct
AI. In the old setup, all regression AIs had the same name, which
made it impossible to run both regressions in parallel. With the new
setup this is possible.

Although all files are available to run the regression, it won't
really work till CMake is introduced (which will happen in a few
commits from here)
For grfs, it now uses CMake scripts to do its job, and both grf
files are split into their own folder to make more clear what is
going on. Additionally, it no longer builds in-source (although the
resulting grf is copied back in the source folder).

For ob[msg] it now uses CMake scripts to generate the translation
files; the result is no longer stored in-source (but in the build
folder).

Although all files are available to create the GRFs and basesets, it
won't really work till CMake is introduced (which will happen in a
few commits from here)
CMake works on all our supported platforms, like MSVC, Mingw, GCC,
Clang, and many more. It allows for a single way of doing things,
so no longer we need shell scripts and vbs scripts to work on all
our supported platforms.

Additionally, CMake allows to generate project files for like MSVC,
KDevelop, etc.

This heavily reduces the lines of code we need to support multiple
platforms from a project perspective.

Addtiionally, this heavily improves our detection of libraries, etc.
CPack works closely together with CMake to do the right thing in
terms of bundling (called 'package'). This generates all the
packaging we need, and some more.
This also means dropping Debian/jessie, as it has a CMake that is
too old (3.0), with no real path to upgrade.
With CMake, these files are simply not compiled to start with.
@glx22 glx22 force-pushed the TrueBrain:cmake branch from d711229 to 6ec6567 Jun 4, 2020
@glx22
Copy link
Contributor

@glx22 glx22 commented Jun 4, 2020

Fixed conflicts, removed temp commit, and squashed

@nielsmh
nielsmh approved these changes Jun 4, 2020
Copy link
Contributor

@nielsmh nielsmh left a comment

Let's do this!

@danchr danchr mentioned this pull request Jun 5, 2020
@LordAro
LordAro approved these changes Jun 5, 2020
Copy link
Member

@LordAro LordAro left a comment

Screw it.

@glx22 glx22 merged commit 945508b into OpenTTD:master Jun 5, 2020
8 checks passed
8 checks passed
Commit checker
Details
OpenTTD CI Build #20200604.18 succeeded
Details
OpenTTD CI (Linux linux-amd64-clang-3.9) Linux linux-amd64-clang-3.9 succeeded
Details
OpenTTD CI (Linux linux-amd64-gcc-6) Linux linux-amd64-gcc-6 succeeded
Details
OpenTTD CI (Linux linux-i386-gcc-6) Linux linux-i386-gcc-6 succeeded
Details
OpenTTD CI (MacOS) MacOS succeeded
Details
OpenTTD CI (Windows Win32) Windows Win32 succeeded
Details
OpenTTD CI (Windows Win64) Windows Win64 succeeded
Details
@TrueBrain TrueBrain deleted the TrueBrain:cmake branch Jun 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

You can’t perform that action at this time.