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.

Sign up for GitHub

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

Jump to bottom

Integrate support for building with dependencies from vcpkg #1880

Merged
merged 5 commits into from
Dec 26, 2023
Merged

Integrate support for building with dependencies from vcpkg #1880

merged 5 commits into from
Dec 26, 2023

Commits on Nov 16, 2023

  1. Integrate support for building with dependencies from vcpkg 

    Configure the build using -DUSE_VCPKG=ON to use vcpkg. By default
recommended triplets targeting the OS versions official builds support
are used. You can opt out of this with -DUSE_RECOMMENDED_TRIPLETS=OFF.
    @nadiaholmquist
    nadiaholmquist committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    aee09fe View commit details
    Browse the repository at this point in the history

  2. Add the vcpkg manifest

    @nadiaholmquist
    nadiaholmquist committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    14b6c2d View commit details
    Browse the repository at this point in the history

  3. Fetch vcpkg with FetchContent if we don't have it

    @nadiaholmquist
    nadiaholmquist committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    8b50f64 View commit details
    Browse the repository at this point in the history

  4. macOS cross compiling fixes 

    - can't use the x86_64 one as host triplet on arm64 because building Qt
  fails for whatever reason. Because of course it does :D
- vcpkg doesn't always like periods in triplet names so removed those
    @nadiaholmquist
    nadiaholmquist committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    d5f588f View commit details
    Browse the repository at this point in the history

  5. x86_64 macOS should also use its recommended target when building arm… 

    …64 builds
    @nadiaholmquist
    nadiaholmquist committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    cee1b80 View commit details
    Browse the repository at this point in the history