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

If external nlohmann::json is not found, then use one from our submodule #865

Merged
merged 8 commits into from
Jun 18, 2021
Merged

If external nlohmann::json is not found, then use one from our submodule #865

merged 8 commits into from
Jun 18, 2021

Commits on May 11, 2021

  1. Add curl via vcpkg to WIndows builds

    @maxgolov
    maxgolov committed May 11, 2021
    Configuration menu
    Copy the full SHA
    076effa View commit details
    Browse the repository at this point in the history

Commits on May 13, 2021

  1. Merge branch 'main' of http://github.com/open-telemetry/opentelemetry… 

    …-cpp
    @maxgolov
    maxgolov committed May 13, 2021
    Configuration menu
    Copy the full SHA
    0f13e20 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2021

  1. Merge branch 'main' of http://github.com/open-telemetry/opentelemetry… 

    …-cpp
    @maxgolov
    maxgolov committed May 19, 2021
    Configuration menu
    Copy the full SHA
    0540d32 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2021

  1. Merge branch 'main' of http://github.com/open-telemetry/opentelemetry… 

    …-cpp
    @maxgolov
    maxgolov committed May 20, 2021
    Configuration menu
    Copy the full SHA
    c437cef View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2021

  1. Merge branch 'main' of http://github.com/open-telemetry/opentelemetry… 

    …-cpp
    @maxgolov
    maxgolov committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    3f37a7a View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2021

  1. Merge branch 'main' of http://github.com/open-telemetry/opentelemetry… 

    …-cpp
    @maxgolov
    maxgolov committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    157c906 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2021

  1. Merge branch 'main' of http://github.com/open-telemetry/opentelemetry… 

    …-cpp
    @maxgolov
    maxgolov committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    649e722 View commit details
    Browse the repository at this point in the history

  2. CMake fix for using local nlohmann::json library from submodule

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