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

fix vcpkg_configure_cmake for case when having semicolons in OPTIONS #12977

Merged
merged 13 commits into from
Aug 24, 2020
Merged

fix vcpkg_configure_cmake for case when having semicolons in OPTIONS #12977

merged 13 commits into from
Aug 24, 2020

Commits on Aug 17, 2020

  1. Merge pull request #1 from microsoft/master 

    incorporate changes from microsoft:master
    @jgehw
    jgehw committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    d3121ce View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. fix microsoft#4320

    jgehw authored and jgehw committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    b1d9f9b View commit details
    Browse the repository at this point in the history

  2. Revert "incorporate changes from microsoft:master"

    @jgehw
    jgehw committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    c743e49 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from jgehw/revert-1-master 

    Revert "incorporate changes from microsoft:master"
    @jgehw
    jgehw committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    2571bd1 View commit details
    Browse the repository at this point in the history

  4. Revert "Revert "incorporate changes from microsoft:master""

    @jgehw
    jgehw committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    98ecc0c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/microsoft/vcpkg

    jgehw authored and jgehw committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    ab8fdf7 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2020

  1. Merge branch 'master' of https://github.com/microsoft/vcpkg

    jgehw authored and jgehw committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    36143ac View commit details
    Browse the repository at this point in the history

  2. merge branch 'master' into 'fix-vcpkg-configure-cmake' to resolve CI … 

    …failures, eg from PR microsoft#13000
    jgehw authored and jgehw committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    09e6c3e View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into HEAD

    @BillyONeal
    BillyONeal committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    7c3ecc0 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2020

  1. Merge branch 'master' of https://github.com/microsoft/vcpkg

    jgehw authored and jgehw committed Aug 21, 2020
    Configuration menu
    Copy the full SHA
    1866a82 View commit details
    Browse the repository at this point in the history

  2. merge branch 'master' into 'fix-vcpkg-configure-cmake' to resolve fur… 

    …ther CI failures, eg from PR microsoft#13048
    jgehw authored and jgehw committed Aug 21, 2020
    Configuration menu
    Copy the full SHA
    ecfeff9 View commit details
    Browse the repository at this point in the history

  3. fix usage of vcpkg_configure_cmake() 

    - ${FORTRAN_CMAKE} is a list, which doesn't get expanded when quoted
- previously this didn't hurt because due to the bug in vcpkg_configure_make() everything, even strings containing semicolons, got expanded as list
    jgehw authored and jgehw committed Aug 21, 2020
    Configuration menu
    Copy the full SHA
    3827f3c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'fix-vcpkg-configure-cmake' of https://github.com/jgehw/… 

    …vcpkg into fix-vcpkg-configure-cmake
    jgehw authored and jgehw committed Aug 21, 2020
    Configuration menu
    Copy the full SHA
    ffe3253 View commit details
    Browse the repository at this point in the history