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: improve platform/compiler/architecture detection and make cross-building to QNX on Windows possible #137

Merged
merged 4 commits into from
Oct 25, 2024

Conversation

VDanielEdwards
Copy link
Member

Subject

This PR adapts the platform/compiler/architecture extraction logic to allow cross-builds to QNX on Windows. It also unifies some logic and adds VS2022 detection, with a new fallback for 'unknown' MSVC toolset versions.

It also adapts the QNX toolchain base file to skip settings the rpath on the build-artifacts which is extremely broken on Windows. Since the QNX binaries (e.g., test executables) cannot be executed on the host (not the cross-build target) anyway, this shouldn't break anything.

Description

Instructions for review / testing

Developer checklist (address before review)

  • Changelog.md updated
  • Prepared update for depending repositories
  • Documentation updated (public API changes only)
  • API docstrings updated (public API changes only)
  • Rebase → commit history clean
  • Squash and merge → proper PR title

@VDanielEdwards VDanielEdwards self-assigned this Oct 24, 2024
@VDanielEdwards VDanielEdwards changed the title cmake: allow QNX cross-build on Windows cmake: improve platform/compiler/architecture detection and make cross-building to QNX on Windows possible Oct 24, 2024
…ke cross-building to QNX on Windows possible
Copy link
Collaborator

@MariusBgm MariusBgm left a comment

Choose a reason for hiding this comment

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

LGTM!
Tested on NetBSD, VS2017 Generator and QNX crossbuild on Windows.

SilKit/cmake/get_compiler_arch.cmake Outdated Show resolved Hide resolved
SilKit/cmake/get_compiler_arch.cmake Show resolved Hide resolved
…ke cross-building to QNX on Windows possible
@VDanielEdwards VDanielEdwards merged commit 9fb8d8f into main Oct 25, 2024
13 checks passed
@VDanielEdwards VDanielEdwards deleted the silkit-1631_qnx_cross_on_windows branch October 25, 2024 08:35
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.

2 participants