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 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 and others added 5 commits June 4, 2020 09:48
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 LordAro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
LordAro
LordAro previously approved these changes Jun 5, 2020
CMakeLists.txt Outdated Show resolved Hide resolved
cmake/CompileFlags.cmake Outdated Show resolved Hide resolved
cmake/Options.cmake Outdated Show resolved Hide resolved
@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
@danchr danchr deleted the cmake-mac-tweaks branch July 1, 2020 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants