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

[vcpkg] Refactor toolchain & generator selection #23846

Merged
merged 21 commits into from
Apr 11, 2022
Merged

[vcpkg] Refactor toolchain & generator selection #23846

merged 21 commits into from
Apr 11, 2022

Commits on Mar 29, 2022

  1. put default generator and toolchain selection into a function

    Alexander Neumann committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    aafdf57 View commit details
    Browse the repository at this point in the history

  2. update version-date of script

    Alexander Neumann committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    5bba185 View commit details
    Browse the repository at this point in the history

  3. version stuff

    Alexander Neumann committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    0abc14a View commit details
    Browse the repository at this point in the history

  4. restore PREFER_NINJA behavior on windows 

    use elseif instead of else
    Alexander Neumann committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    4d6c67b View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. Merge remote-tracking branch 'upstream/master' into select_default_ge… 

    …nerator
    Alexander Neumann committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    6fba820 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into dont_clober_cmake… 

    …_program_path

# Conflicts:
#	scripts/buildsystems/vcpkg.cmake
    @Neumann-A
    Neumann-A committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    76d5d1a View commit details
    Browse the repository at this point in the history

  3. cr ws change

    @Neumann-A
    Neumann-A committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    ae8396a View commit details
    Browse the repository at this point in the history

  4. missing ,

    @Neumann-A
    Neumann-A committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    caceffa View commit details
    Browse the repository at this point in the history

  5. version stuff

    @Neumann-A
    Neumann-A committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    91e3b41 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Merge remote-tracking branch 'upstream/master' into select_default_ge… 

    …nerator
    Alexander Neumann committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    0cb2bc4 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Merge remote-tracking branch 'upstream/master' into select_default_ge… 

    …nerator
    @Neumann-A
    Neumann-A committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    da873e4 View commit details
    Browse the repository at this point in the history

  2. CR scripts/cmake/vcpkg_configure_cmake.cmake 

    Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
    @Neumann-A @strega-nil
    Neumann-A and strega-nil authored Apr 4, 2022
    Configuration menu
    Copy the full SHA
    030b158 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'select_default_generator' of https://github.com/Neumann… 

    …-A/vcpkg into select_default_generator
    @Neumann-A
    Neumann-A committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    8f5b3b0 View commit details
    Browse the repository at this point in the history

  4. CR changes

    @Neumann-A
    Neumann-A committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    39b142f View commit details
    Browse the repository at this point in the history

  5. revert baseline

    @Neumann-A
    Neumann-A committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    2cc27c7 View commit details
    Browse the repository at this point in the history

  6. update version

    @Neumann-A
    Neumann-A committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    7da97a9 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2022

  1. Merge remote-tracking branch 'upstream/master' into select_default_ge… 

    …nerator

# Conflicts:
#	ports/vcpkg-cmake/vcpkg.json
#	versions/baseline.json
#	versions/v-/vcpkg-cmake.json
    Alexander Neumann committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    dd14c4c View commit details
    Browse the repository at this point in the history

  2. bump version

    Alexander Neumann committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    8cb5e82 View commit details
    Browse the repository at this point in the history

  3. version stuff

    Alexander Neumann committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    6d4bb79 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into select_default_ge… 

    …nerator
    @Neumann-A
    Neumann-A committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    9993afb View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. ci retrigger

    Alexander Neumann committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    d3d58bb View commit details
    Browse the repository at this point in the history