From 134a5faa2b3a408636eb10c4f5408e75fdb71942 Mon Sep 17 00:00:00 2001 From: Carlos Gomes Martinho Date: Fri, 29 Nov 2019 13:49:53 +0100 Subject: [PATCH 1/3] docs: add central repository as conan source to readme --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0ecd8971..b4e5df2f 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,8 @@ [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/nlohmann/json.svg)](http://isitmaintained.com/project/nlohmann/json "Average time to resolve an issue") [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/289/badge)](https://bestpractices.coreinfrastructure.org/projects/289) [![GitHub Sponsors](https://img.shields.io/badge/GitHub-Sponsors-ff69b4)](https://github.com/sponsors/nlohmann) - +[![Conan](https://api.bintray.com/packages/conan/conan-center/nlohmann_json%3A_/images/download.svg) ](https://bintray.com/conan/conan-center/nlohmann_json%3A_/_latestVersion) + - [Design goals](#design-goals) - [Integration](#integration) - [CMake](#cmake) @@ -159,7 +160,7 @@ If you are using the [Meson Build System](http://mesonbuild.com), add this sourc The provided meson.build can also be used as an alternative to cmake for installing `nlohmann_json` system-wide in which case a pkg-config file is installed. To use it, simply have your build system require the `nlohmann_json` pkg-config dependency. In Meson, it is preferred to use the [`dependency()`](https://mesonbuild.com/Reference-manual.html#dependency) object with a subproject fallback, rather than using the subproject directly. -If you are using [Conan](https://www.conan.io/) to manage your dependencies, merely add `jsonformoderncpp/x.y.z@vthiery/stable` to your `conanfile.py`'s requires, where `x.y.z` is the release version you want to use. Please file issues [here](https://github.com/vthiery/conan-jsonformoderncpp/issues) if you experience problems with the packages. +If you are using [Conan](https://www.conan.io/) to manage your dependencies, merely add `nlohmann_json/x.y.z` to your `conanfile`'s requires, where `x.y.z` is the release version you want to use. Please file issues [here](https://github.com/conan-io/conan-center-index/issues) if you experience problems with the packages. If you are using [Spack](https://www.spack.io/) to manage your dependencies, you can use the [`nlohmann-json` package](https://spack.readthedocs.io/en/latest/package_list.html#nlohmann-json). Please see the [spack project](https://github.com/spack/spack) for any issues regarding the packaging. From f44e8ac090640cb18baac55e13134e44b900cddd Mon Sep 17 00:00:00 2001 From: Carlos Gomes Martinho Date: Sun, 1 Dec 2019 10:22:48 +0100 Subject: [PATCH 2/3] revert: adding conan badge --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index b4e5df2f..ce76c6c7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,6 @@ [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/nlohmann/json.svg)](http://isitmaintained.com/project/nlohmann/json "Average time to resolve an issue") [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/289/badge)](https://bestpractices.coreinfrastructure.org/projects/289) [![GitHub Sponsors](https://img.shields.io/badge/GitHub-Sponsors-ff69b4)](https://github.com/sponsors/nlohmann) -[![Conan](https://api.bintray.com/packages/conan/conan-center/nlohmann_json%3A_/images/download.svg) ](https://bintray.com/conan/conan-center/nlohmann_json%3A_/_latestVersion) - [Design goals](#design-goals) - [Integration](#integration) From ac9df4845346aa65f7fc1003b2af1818b5cc3654 Mon Sep 17 00:00:00 2001 From: Carlos Gomes Martinho Date: Sun, 1 Dec 2019 10:23:24 +0100 Subject: [PATCH 3/3] style: format readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ce76c6c7..fab21590 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/nlohmann/json.svg)](http://isitmaintained.com/project/nlohmann/json "Average time to resolve an issue") [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/289/badge)](https://bestpractices.coreinfrastructure.org/projects/289) [![GitHub Sponsors](https://img.shields.io/badge/GitHub-Sponsors-ff69b4)](https://github.com/sponsors/nlohmann) - + - [Design goals](#design-goals) - [Integration](#integration) - [CMake](#cmake)