Upgrade Core and include Blaze

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

.github/workflows/ci.yml

@@ -109,6 +109,12 @@ jobs:
       - run: >
           cmake --install ./build --prefix ./build/dist --config Release --verbose
           --component sourcemeta_core_dev
+      - run: >
+          cmake --install ./build --prefix ./build/dist --config Release --verbose
+          --component sourcemeta_blaze
+      - run: >
+          cmake --install ./build --prefix ./build/dist --config Release --verbose
+          --component sourcemeta_blaze_dev
       - run: >
           cmake --install ./build --prefix ./build/dist --config Release --verbose
           --component sourcemeta_jsonbinpack

CMakeLists.txt

@@ -18,6 +18,7 @@ option(JSONBINPACK_ADDRESS_SANITIZER "Build JSON BinPack with an address sanitiz
 option(JSONBINPACK_UNDEFINED_SANITIZER "Build JSON BinPack with an undefined behavior sanitizer" OFF)
 
 find_package(Core REQUIRED)
+find_package(Blaze REQUIRED)
 
 if(JSONBINPACK_INSTALL)
   include(GNUInstallDirs)
@@ -36,9 +37,6 @@ if(JSONBINPACK_INSTALL)
     COMPONENT sourcemeta_jsonbinpack_dev)
 endif()
 
-# Dependencies
-find_package(Core REQUIRED)
-
 # Numeric
 if(JSONBINPACK_NUMERIC)
   add_subdirectory(src/numeric)

DEPENDENCIES

@@ -1,3 +1,4 @@
 vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
-core https://github.com/sourcemeta/core 57e8c91ed68e3ee903526fd2f45cb16ca46759d8
+core https://github.com/sourcemeta/core efaed8a73fa1ba38f0c2fdcbd11d0b3223c5a70e
+blaze https://github.com/sourcemeta/blaze 0ff98cb5e537f571bdf04f0d59a031a0d8634e07
 bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

Makefile

@@ -27,6 +27,10 @@ compile: .always
 		--component sourcemeta_core
 	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
 		--component sourcemeta_core_dev
+	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
+		--component sourcemeta_blaze
+	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
+		--component sourcemeta_blaze_dev
 	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
 		--component sourcemeta_jsonbinpack
 	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \

cmake/FindBlaze.cmake

@@ -0,0 +1,14 @@
+if(NOT Blaze_FOUND)
+  if(JSONBINPACK_INSTALL)
+    set(SOURCEMETA_BLAZE_INSTALL ON CACHE BOOL "enable installation")
+  else()
+    set(SOURCEMETA_BLAZE_INSTALL OFF CACHE BOOL "disable installation")
+  endif()
+
+  set(BLAZE_TEST OFF CACHE BOOL "disable")
+  set(BLAZE_CONFIGURATION OFF CACHE BOOL "disable")
+  set(BLAZE_CONTRIB OFF CACHE BOOL "disable")
+  add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/blaze")
+  include(Sourcemeta)
+  set(Blaze_FOUND ON)
+endif()

cmake/FindCore.cmake

@@ -10,7 +10,7 @@ if(NOT Core_FOUND)
   set(SOURCEMETA_CORE_GZIP OFF CACHE BOOL "disable")
   set(SOURCEMETA_CORE_MD5  OFF CACHE BOOL "disable")
   set(SOURCEMETA_CORE_JSONL OFF CACHE BOOL "disable JSONL support")
-  set(SOURCEMETA_CORE_YAML OFF CACHE BOOL "disable YAML support")
+  set(SOURCEMETA_CORE_YAML ON CACHE BOOL "needed by Blaze")
   set(SOURCEMETA_CORE_EXTENSION_OPTIONS OFF CACHE BOOL "disable")
   set(SOURCEMETA_CORE_EXTENSION_BUILD OFF CACHE BOOL "disable")
   set(SOURCEMETA_CORE_CONTRIB_GOOGLETEST ${JSONBINPACK_TESTS} CACHE BOOL "GoogleTest")

config.cmake.in

@@ -10,7 +10,8 @@ if(NOT JSONBINPACK_COMPONENTS)
 endif()
 
 include(CMakeFindDependencyMacro)
-find_dependency(Core COMPONENTS regex uri json jsonpointer jsonschema alterschema)
+find_dependency(Core COMPONENTS regex uri json jsonpointer jsonschema)
+find_dependency(Blaze COMPONENTS alterschema)
 
 foreach(component ${JSONBINPACK_COMPONENTS})
   if(component STREQUAL "numeric")