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

CMake mac tweaks #8188

Merged
merged 7 commits into from Jun 30, 2020
Merged

CMake mac tweaks #8188

merged 7 commits into from Jun 30, 2020

Conversation

@danchr
Copy link
Contributor

danchr commented Jun 5, 2020

This PR contains a few minor fixes and tweaks for the CMake build infrastructure on a Mac, kept separate from a larger and possibly more controversial change.

danchr added 5 commits Jun 4, 2020
This silences an awful lot of warnings.
I tried building a tag, and got this error:

CMake Error at cmake/scripts/FindVersion.cmake:85 (string):
  string sub-command REGEX, mode REPLACE: regex "^[0-9.]*$" matched an empty
  string.
Copy link
Member

LordAro left a comment

Nothing major

cmake/Options.cmake Outdated Show resolved Hide resolved
cmake/CompileFlags.cmake Outdated Show resolved Hide resolved
cmake/CompileFlags.cmake Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
@danchr danchr force-pushed the danchr:cmake-mac-tweaks branch from af3e9f1 to e31eeae Jun 5, 2020
CMakeLists.txt Outdated Show resolved Hide resolved
@danchr danchr force-pushed the danchr:cmake-mac-tweaks branch from e31eeae to 91e6fdc Jun 5, 2020
cmake/CompileFlags.cmake Outdated Show resolved Hide resolved
cmake/Options.cmake Outdated Show resolved Hide resolved
@danchr danchr force-pushed the danchr:cmake-mac-tweaks branch from 91e6fdc to cdc1b2c Jun 18, 2020
@danchr
Copy link
Contributor Author

danchr commented Jun 18, 2020

I applied the requested changes and rebased onto master; I also added a separate commit to suppress checking for SDL and FreeType on macOS.

@LordAro LordAro merged commit 7fd7b51 into OpenTTD:master Jun 30, 2020
8 checks passed
8 checks passed
Commit checker
Details
OpenTTD CI Build #20200618.10 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
@danchr danchr deleted the danchr:cmake-mac-tweaks branch Jul 1, 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.

None yet

3 participants
You can’t perform that action at this time.