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

Use CMakeDeps and CMakeToolchain as Generators on Conan #4335

Merged
merged 10 commits into from
Jan 29, 2023
Merged

Use CMakeDeps and CMakeToolchain as Generators on Conan #4335

merged 10 commits into from
Jan 29, 2023

Commits on Jan 28, 2023

  1. deps(conan): use CMakeDeps as generator

    @Nerixyz
    Nerixyz committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    6a42f77 View commit details
    Browse the repository at this point in the history

  2. chore: add changelog entry

    @Nerixyz
    Nerixyz committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    3eab2ca View commit details
    Browse the repository at this point in the history

  3. deps(conan): add CMakeToolchain generator

    @Nerixyz
    Nerixyz committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    6e2a311 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2023

  1. fix: use generated toolchain file

    @Nerixyz
    Nerixyz committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    b1abfc5 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into refactor/conan 

    # Conflicts:
#	CHANGELOG.md
    @Nerixyz
    Nerixyz committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    8593216 View commit details
    Browse the repository at this point in the history

  3. docs: mention toolchain as well

    @Nerixyz
    Nerixyz committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    c2f9631 View commit details
    Browse the repository at this point in the history

  4. fix: spelling

    @Nerixyz
    Nerixyz committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    5d33be5 View commit details
    Browse the repository at this point in the history

  5. fix: formatting

    @Nerixyz
    Nerixyz committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    8c4080c View commit details
    Browse the repository at this point in the history

  6. revert: use nmake

    @Nerixyz
    Nerixyz committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    b4de6bb View commit details
    Browse the repository at this point in the history

  7. docs: fix documentation

    @Nerixyz
    Nerixyz committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    95c697c View commit details
    Browse the repository at this point in the history