From 3cb05155be3187de9b33dda866d93328350d7781 Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Mon, 23 Dec 2019 15:20:52 -0500 Subject: [PATCH] Remove one level of nesting; add README.txt --- thirdparty/nlohmann_json/CMakeLists.txt | 4 ++-- thirdparty/nlohmann_json/LICENSE.MIT | 17 +++++++++++++++++ thirdparty/nlohmann_json/README.txt | 4 ++++ .../{include => }/nlohmann/json.hpp | 0 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 thirdparty/nlohmann_json/LICENSE.MIT create mode 100644 thirdparty/nlohmann_json/README.txt rename thirdparty/nlohmann_json/{include => }/nlohmann/json.hpp (100%) diff --git a/thirdparty/nlohmann_json/CMakeLists.txt b/thirdparty/nlohmann_json/CMakeLists.txt index 99e05c819b..9b9420b29a 100644 --- a/thirdparty/nlohmann_json/CMakeLists.txt +++ b/thirdparty/nlohmann_json/CMakeLists.txt @@ -1,7 +1,7 @@ add_library( nlohmann_json INTERFACE ) -target_include_directories( nlohmann_json INTERFACE include ) +target_include_directories( nlohmann_json INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} ) target_sources( nlohmann_json INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/include/nlohmann/json.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/nlohmann/json.hpp ) \ No newline at end of file diff --git a/thirdparty/nlohmann_json/LICENSE.MIT b/thirdparty/nlohmann_json/LICENSE.MIT new file mode 100644 index 0000000000..7215f6950b --- /dev/null +++ b/thirdparty/nlohmann_json/LICENSE.MIT @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/thirdparty/nlohmann_json/README.txt b/thirdparty/nlohmann_json/README.txt new file mode 100644 index 0000000000..fc0b705ccb --- /dev/null +++ b/thirdparty/nlohmann_json/README.txt @@ -0,0 +1,4 @@ +This directory contains the nlohmann/json project from https://github.com/nlohmann/json. + +It is licensed under MIT, with the license text in this directory. + diff --git a/thirdparty/nlohmann_json/include/nlohmann/json.hpp b/thirdparty/nlohmann_json/nlohmann/json.hpp similarity index 100% rename from thirdparty/nlohmann_json/include/nlohmann/json.hpp rename to thirdparty/nlohmann_json/nlohmann/json.hpp