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

cmake presets with VS and ninja and improved merge #11666

Merged
merged 23 commits into from Jul 22, 2022
Merged

cmake presets with VS and ninja and improved merge #11666

merged 23 commits into from Jul 22, 2022

Commits on Jul 15, 2022

  1. tests pending

    @lasote
    lasote committed Jul 15, 2022
    Copy the full SHA
    eb8ca1e View commit details
    Browse the repository at this point in the history

  2. Added tests

    @lasote
    lasote committed Jul 15, 2022
    Copy the full SHA
    c7bb59b View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2022

  1. Fix default

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    0baa690 View commit details
    Browse the repository at this point in the history

  2. not cpp 20

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    cd20a33 View commit details
    Browse the repository at this point in the history

  3. Fixed conflict and fixed tests

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    a41f239 View commit details
    Browse the repository at this point in the history

  4. Update conan/tools/cmake/presets.py 

    Co-authored-by: James <james@conan.io>
    @lasote @memsharded
    lasote and memsharded committed Jul 18, 2022
    Copy the full SHA
    fd54548 View commit details
    Browse the repository at this point in the history

  5. fix

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    b647ead View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/presets_schema_2' of github.com:lasote/conan in… 

    …to feature/presets_schema_2
    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    df2235a View commit details
    Browse the repository at this point in the history

  7. WIP

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    1274671 View commit details
    Browse the repository at this point in the history

  8. Fix win test

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    39fecea View commit details
    Browse the repository at this point in the history

  9. Tested win

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    59cff72 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'feature/presets_schema_2' into feature/cmake_presets_ninja

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    29a38f8 View commit details
    Browse the repository at this point in the history

  11. toolset and architecture for Ninka

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    abdd0ce View commit details
    Browse the repository at this point in the history

  12. Fix bug duplicated

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    b5c8ea0 View commit details
    Browse the repository at this point in the history

  13. Fixed bug

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    d74addd View commit details
    Browse the repository at this point in the history

  14. Merge branch 'feature/cmake_presets_ninja' of github.com:lasote/conan… 

    … into feature/cmake_presets_ninja
    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    92f31ed View commit details
    Browse the repository at this point in the history

  15. comment

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    99a1b31 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'feature/cmake_presets_ninja' of github.com:lasote/conan… 

    … into feature/cmake_presets_ninja
    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    dbffff2 View commit details
    Browse the repository at this point in the history

  17. Test ninja cmake presets

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    460fa08 View commit details
    Browse the repository at this point in the history

  18. version only for non windows

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    aeb419a View commit details
    Browse the repository at this point in the history

  19. compiler 191

    @lasote
    lasote committed Jul 18, 2022
    Copy the full SHA
    fb37bd8 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2022

  1. Merged develop

    @lasote
    lasote committed Jul 19, 2022
    Copy the full SHA
    8afdaab View commit details
    Browse the repository at this point in the history

  2. CMakePresets bugfixes related to the update of a configuration

    @lasote
    lasote committed Jul 19, 2022
    Copy the full SHA
    74e244e View commit details
    Browse the repository at this point in the history