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

Feature/483 Conan 2 Support #620

Merged
merged 23 commits into from
Aug 24, 2023
Merged

Feature/483 Conan 2 Support #620

merged 23 commits into from
Aug 24, 2023

Commits on Aug 20, 2023

  1. Drop generators unsupported by Conan 2.0 

    Drop generators unsupported by Conan 2.0
    @PengZheng
    PengZheng committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    60b5941 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/483-conan-2-support

    @PengZheng
    PengZheng committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    681c6ef View commit details
    Browse the repository at this point in the history

  3. Use conan2's conanrun.sh

    @PengZheng
    PengZheng committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    2e42f25 View commit details
    Browse the repository at this point in the history

  4. Stop gap for #618

    @PengZheng
    PengZheng committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    93d93ec View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Specify dependency options in a way compatible with both Conan1 and C… 

    …onan2.
    @PengZheng
    PengZheng committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    949ec5d View commit details
    Browse the repository at this point in the history

  2. Implement dynamic defaults. 

    Dynamic defaults is unsupported by Conan2 according to conan-io/conan#14528
    @PengZheng
    PengZheng committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    6d25aa6 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. Simplify options settings.

    @PengZheng
    PengZheng committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    c181c05 View commit details
    Browse the repository at this point in the history

  2. Fix version conflict of openssl caused by civetweb.

    @PengZheng
    PengZheng committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    73f44ea View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. Add test_package for Conan2.

    @PengZheng
    PengZheng committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    0033657 View commit details
    Browse the repository at this point in the history

  2. Fix linking error caused by private linking of transitive dependencie… 

    …s and wrong cwd.
    @PengZheng
    PengZheng committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    ff7ad59 View commit details
    Browse the repository at this point in the history

  3. Use Conan2 for conan_create/ubuntu-build

    @PengZheng
    PengZheng committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    af02716 View commit details
    Browse the repository at this point in the history

  4. Fix profile setup for conan_create/ubuntu-build

    @PengZheng
    PengZheng committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    f292a83 View commit details
    Browse the repository at this point in the history

  5. Fix option setting error for conan_create/ubuntu-build

    @PengZheng
    PengZheng committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    dfae92e View commit details
    Browse the repository at this point in the history

  6. Remove irrelevant dependency of unit_test_rsa_common.

    @PengZheng
    PengZheng committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    e7d277a View commit details
    Browse the repository at this point in the history

  7. Fix missing deps_cpp_info for Conan 2

    @PengZheng
    PengZheng committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    1c5605a View commit details
    Browse the repository at this point in the history

  8. Update documentation to reflect the new conan based workflow.

    @PengZheng
    PengZheng committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    a2d547a View commit details
    Browse the repository at this point in the history

  9. Remove unsupported conan build --configure.

    @PengZheng
    PengZheng committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    2e48484 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Enable ninja for all conan build.

    @PengZheng
    PengZheng committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    ff26503 View commit details
    Browse the repository at this point in the history

  2. Run gcov by ninja.

    @PengZheng
    PengZheng committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    ad18430 View commit details
    Browse the repository at this point in the history

  3. Run gcov by GNU make.

    @PengZheng
    PengZheng committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    697e7ed View commit details
    Browse the repository at this point in the history

  4. Fix asan error and re-enable pubsub_udpmc_tests.

    @PengZheng
    PengZheng committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    a76ad79 View commit details
    Browse the repository at this point in the history

  5. Still recommend using conan build in our Conan-based CLion workflow… 

    … but mention a quicker way to skip full building.
    @PengZheng
    PengZheng committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    9ea3246 View commit details
    Browse the repository at this point in the history

  6. Avoid breaking downstream user who link to these targets.

    @PengZheng
    PengZheng committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    4e7c7a4 View commit details
    Browse the repository at this point in the history