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

Feature/toolchain cmake cross #9115

Merged
merged 9 commits into from
Jun 21, 2021
Merged

Feature/toolchain cmake cross #9115

merged 9 commits into from
Jun 21, 2021

Commits on Jun 15, 2021

  1. wip

    @memsharded
    memsharded committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    2a74cb5 View commit details
    Browse the repository at this point in the history

  2. wip

    @memsharded
    memsharded committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    5d1125d View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2021

  1. initial proposal for cmake cross build

    @memsharded
    memsharded committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    47f8873 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2021

  1. fixed bug with os check

    @memsharded
    memsharded committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    8f63014 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2021

  1. Update conan/tools/cmake/toolchain.py 

    Co-authored-by: Luis Martinez de Bartolome Izquierdo <lasote@gmail.com>
    @memsharded @lasote
    memsharded and lasote committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    14f15ae View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2021

  1. Feature/conf cli support conan-io#9038 (conan-io#9103) 

    * Added --conf argument as new possible argument for conan create, install, export_dpkg, etc

* Fixed bad positional argument

* Added TODOs and conf merge

* Added several tests for conf cli option

* Simplified integration test

* Added more tests

* Added more complete integration test
    @franramirez688 @memsharded
    franramirez688 authored and memsharded committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    f3bbcc1 View commit details
    Browse the repository at this point in the history

  2. added architecture check

    @memsharded
    memsharded committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    973c6f0 View commit details
    Browse the repository at this point in the history

  3. custom user_toolchain disables cross-build

    @memsharded
    memsharded committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    b45ccf6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into feature/toolchain_cmake_cross

    @memsharded
    memsharded committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    cbc188b View commit details
    Browse the repository at this point in the history