mirror of
https://github.com/pantor/inja.git
synced 2026-05-30 07:45:23 +00:00
include nlohmann/json in inja directly
This commit is contained in:
+1
-2
@@ -4,8 +4,7 @@ unit_test = executable(
|
||||
'src/unit-files.cpp',
|
||||
'src/unit-renderer.cpp',
|
||||
'src/unit-string-helper.cpp',
|
||||
dependencies: inja_dep,
|
||||
include_directories: include_directories('thirdparty')
|
||||
dependencies: inja_dep
|
||||
)
|
||||
|
||||
test('Inja unit test', unit_test)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "catch/catch.hpp"
|
||||
#include "nlohmann/json.hpp"
|
||||
#include "inja.hpp"
|
||||
#include "nlohmann/json.hpp"
|
||||
|
||||
|
||||
using json = nlohmann::json;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "catch/catch.hpp"
|
||||
#include "nlohmann/json.hpp"
|
||||
#include "inja.hpp"
|
||||
#include "nlohmann/json.hpp"
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "catch/catch.hpp"
|
||||
#include "nlohmann/json.hpp"
|
||||
#include "inja.hpp"
|
||||
#include "nlohmann/json.hpp"
|
||||
|
||||
|
||||
|
||||
|
||||
Vendored
-21
@@ -1,21 +0,0 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2013-2017 Niels Lohmann
|
||||
|
||||
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.
|
||||
Vendored
-17190
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user