mirror of https://github.com/microsoft/vcpkg.git
[valijson] update to 1.0.1 (#35322)
* [valijson] update to 1.0.1 * format * v db
This commit is contained in:
parent
ab76a78f72
commit
253f8fffd7
|
|
@ -1,12 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
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>
|
||||
|
|
@ -1,24 +1,23 @@
|
|||
#header-only library
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO tristanpenman/valijson
|
||||
REF v0.6
|
||||
SHA512 a493d17159e479be7fe29d45c610c7d4fdd2c2f9ba897923129734fb07257dbb41fddde4c4263dbf0aa5c7101cd1555568a048beba2f60d2b32e625dd9690749
|
||||
REF v${VERSION}
|
||||
SHA512 a1f9aabfcd150a36ed16c5642027a9c524ec044dd1eb636a81a75f2226b7b665cc3d2f4cd375786be8fc9dadf2c6938df17d6e6fa13f27c621fe2ca35e0d13ee
|
||||
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)
|
||||
set(VCPKG_BUILD_TYPE release) # headers only
|
||||
|
||||
file(COPY ${SOURCE_PATH}/include/compat/optional.hpp
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson/compat)
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-Dvalijson_BUILD_TESTS:BOOL=OFF
|
||||
)
|
||||
vcpkg_cmake_install()
|
||||
|
||||
# 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)
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/valijson")
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug/lib")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,15 @@
|
|||
{
|
||||
"name": "valijson",
|
||||
"version": "0.6",
|
||||
"description": "Header-only C++ library for JSON Schema validation"
|
||||
"version": "1.0.1",
|
||||
"description": "Header-only C++ library for JSON Schema validation",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8761,7 +8761,7 @@
|
|||
"port-version": 6
|
||||
},
|
||||
"valijson": {
|
||||
"baseline": "0.6",
|
||||
"baseline": "1.0.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"value-ptr-lite": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "9a05a76802a936f7549eec49d032a5e6fa220cfb",
|
||||
"version": "1.0.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "7edd27211e0ef58ea307fe1fc4f34aea18cb8529",
|
||||
"version": "0.6",
|
||||
|
|
|
|||
Loading…
Reference in New Issue