early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,12 @@
diff --git a/include/valijson/internal/optional.hpp b/include/valijson/internal/optional.hpp
index c9bc47b..c73c7fb 100644
--- a/include/valijson/internal/optional.hpp
+++ b/include/valijson/internal/optional.hpp
@@ -9,6 +9,6 @@ namespace opt = std;
# endif
# endif
#else
-# include <compat/optional.hpp>
+# include <valijson/compat/optional.hpp>
namespace opt = std::experimental;
#endif

View File

@@ -0,0 +1,34 @@
diff --git a/include/valijson/adapters/picojson_adapter.hpp b/include/valijson/adapters/picojson_adapter.hpp
index 4f5e5b6..0da2bf2 100644
--- a/include/valijson/adapters/picojson_adapter.hpp
+++ b/include/valijson/adapters/picojson_adapter.hpp
@@ -29,10 +29,10 @@
#ifdef _MSC_VER
#pragma warning(disable: 4706)
-#include <picojson.h>
+#include <picojson/picojson.h>
#pragma warning(default: 4706)
#else
-#include <picojson.h>
+#include <picojson/picojson.h>
#endif
#include <valijson/adapters/adapter.hpp>
diff --git a/include/valijson/utils/picojson_utils.hpp b/include/valijson/utils/picojson_utils.hpp
index 36420d2..8660c30 100644
--- a/include/valijson/utils/picojson_utils.hpp
+++ b/include/valijson/utils/picojson_utils.hpp
@@ -4,10 +4,10 @@
#ifdef _MSC_VER
#pragma warning(disable: 4706)
-#include <picojson.h>
+#include <picojson/picojson.h>
#pragma warning(default: 4706)
#else
-#include <picojson.h>
+#include <picojson/picojson.h>
#endif
#include <valijson/utils/file_utils.hpp>

24
externals/vcpkg/ports/valijson/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,24 @@
#header-only library
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tristanpenman/valijson
REF v0.6
SHA512 a493d17159e479be7fe29d45c610c7d4fdd2c2f9ba897923129734fb07257dbb41fddde4c4263dbf0aa5c7101cd1555568a048beba2f60d2b32e625dd9690749
HEAD_REF master
PATCHES fix-picojson.patch
fix-optional.patch
)
# Copy the header files
file(GLOB HEADER_FILES ${SOURCE_PATH}/include/valijson/*)
file(COPY ${HEADER_FILES}
DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson
REGEX "\.(gitattributes|gitignore)$" EXCLUDE)
file(COPY ${SOURCE_PATH}/include/compat/optional.hpp
DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson/compat)
# Put the licence file where vcpkg expects it
file(COPY ${SOURCE_PATH}/LICENSE
DESTINATION ${CURRENT_PACKAGES_DIR}/share/valijson)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/valijson/LICENSE ${CURRENT_PACKAGES_DIR}/share/valijson/copyright)

5
externals/vcpkg/ports/valijson/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,5 @@
{
"name": "valijson",
"version": "0.6",
"description": "Header-only C++ library for JSON Schema validation"
}