From 983f85c5fa8e549a1735c0388e44df03773355a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20DELRIEU?= <theo.delrieu@tanker.io>
Date: Sun, 4 Feb 2018 15:48:33 +0100
Subject: [PATCH] add v3.1.0 support

* multi-header installation is now the default
* Install inside include/nlohmann
* Add sha256 verification
---
 conanfile.py             | 22 ++++++++--------------
 test_package/example.cpp |  5 +++--
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/conanfile.py b/conanfile.py
index 408d376..0972dbe 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -1,29 +1,23 @@
 from conans import ConanFile, tools
-from conans.tools import download
+import os
+
 
 class JsonForModernCppConan(ConanFile):
     name = "jsonformoderncpp"
     version = "3.1.0"
-    homepage = "https://github.com/nlohmann/json"
     description = "JSON for Modern C++ parser and generator from https://github.com/nlohmann/json"
     license = "MIT"
     url = "https://github.com/vthiery/conan-jsonformoderncpp"
+    repo_url = "https://github.com/nlohmann/json"
     author = "Vincent Thiery (vjmthiery@gmail.com)"
 
     def source(self):
-        download("https://github.com/nlohmann/json/releases/download/v%s/json.hpp" % self.version, "json.hpp")
+        tools.download("%s/blob/v%s/LICENSE.MIT" % (self.repo_url, self.version), "LICENSE.MIT")
 
-    def build(self):
-        # as there is no LICENSE file, lets extract and generate it.
-        # It is useful for package consumers, so they can collect all license from all dependencies
-        tmp = tools.load("json.hpp")
-        license_contents = tmp[2:tmp.find("*/", 1)]
-        tools.save("LICENSE", license_contents)
+        expected_hash = "2b7234fca394d1e27b7e017117ed80b7518fafbb4f4c13a7c069624f6f924673"
+        tools.get("%s/releases/download/v%s/include.zip" % (self.repo_url, self.version), sha256=expected_hash)
 
     def package(self):
-        self.copy("*.hpp", dst="include")
-        self.copy("LICENSE")
+        self.copy("*.hpp")
+        self.copy("LICENSE.MIT")
 
-    def package_info(self):
-        self.cpp_info.libdirs = []
-        self.cpp_info.bindirs = []
diff --git a/test_package/example.cpp b/test_package/example.cpp
index 6c7ebcc..fd742ca 100644
--- a/test_package/example.cpp
+++ b/test_package/example.cpp
@@ -1,6 +1,7 @@
-#include "json.hpp"
 #include <iostream>
 
+#include <nlohmann/json.hpp>
+
 using nlohmann::json;
 
 int main()
@@ -13,4 +14,4 @@ int main()
     {
         std::cout << it.key() << " " << it.value() << std::endl;
     }
-}
\ No newline at end of file
+}