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 fixes #8728

Merged
merged 2 commits into from Feb 22, 2021
Merged

Cmake fixes #8728

merged 2 commits into from Feb 22, 2021

Conversation

@glx22
Copy link
Contributor

@glx22 glx22 commented Feb 22, 2021

Fixes #8687

Motivation / Problem

If path to openttd source contains special characters, CMake may fail to generate the build files.
If build files generation works, build may still fail later.

Description

I solved an issue if path contains some regexp commands (example "Openttd(2++)").
Also solved the issue reported in #8687 (using "OpenTTD - cmake error" as source dir)

Limitations

Compilation fails for "Openttd(2++)" but not for "Openttd (2++)", seems to depend on how ADD_CUSTOM_COMMAND decides to quote commands, and we can't do much about that.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')
@glx22 glx22 force-pushed the glx22:cmake_fixes branch from 0e00266 to a897170 Feb 22, 2021
@glx22 glx22 force-pushed the glx22:cmake_fixes branch from a897170 to c703e85 Feb 22, 2021
@glx22 glx22 merged commit b67245d into OpenTTD:master Feb 22, 2021
11 checks passed
11 checks passed
Emscripten
Details
Commit checker
Details
Check preview needs update Check preview needs update
Details
Linux (clang, clang++, libsdl2-dev)
Details
Linux (gcc, g++, libsdl2-dev)
Details
Linux (gcc, g++, libsdl1.2-dev)
Details
Mac OS (x64, x86_64)
Details
Windows (windows-latest, x86)
Details
Windows (windows-latest, x64)
Details
Windows (windows-2016, x86) Windows (windows-2016, x86)
Details
Windows (windows-2016, x64) Windows (windows-2016, x64)
Details
@glx22 glx22 deleted the glx22:cmake_fixes branch Feb 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants