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

Fix: [CMake] Use the right run-time library depending on vcpkg triplet #8964

Merged
merged 1 commit into from Apr 7, 2021

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented Apr 7, 2021

Fixes #8814

Motivation / Problem

During configuration, we force using static run-time library on windows. This is ok when using x64-windows-static or x86-windows-static triplets, but it causes crashes at run time with x64-windows triplet.
Also x64-windows-static-md triplet simply fails to link due to mismatched run-time library types.

Description

Analyse VCPKG_TARGET_TRIPLET to determine if run-time type switching is needed.

Limitations

Highly depends on vcpkg consistency in triplet values, but I see no other way with vcpkg variables available in cmake.

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 added the backport requested This PR should be backport to current release (RC / stable) label Apr 7, 2021
@glx22 glx22 merged commit f306d65 into OpenTTD:master Apr 7, 2021
@glx22 glx22 deleted the md branch April 7, 2021 11:28
LordAro pushed a commit to LordAro/OpenTTD that referenced this pull request Apr 17, 2021
@LordAro LordAro added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Apr 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Assertion failed downloading content from BaNaNaS.
3 participants