Upgrade Noa and JSON Toolkit to the latest versions

.github/workflows/ci.yml

@@ -108,6 +108,12 @@ jobs:
           ${{ matrix.platform.options }}
       - run: cmake --build ./build --config Release --target clang_format_test
       - run: cmake --build ./build --config Release --parallel 4
+      - run: >
+          cmake --install ./build --prefix ./build/dist --config Release --verbose
+          --component sourcemeta_noa
+      - run: >
+          cmake --install ./build --prefix ./build/dist --config Release --verbose
+          --component sourcemeta_noa_dev
       - run: >
           cmake --install ./build --prefix ./build/dist --config Release --verbose
           --component sourcemeta_jsontoolkit

CMakeLists.txt

@@ -3,7 +3,6 @@ project(alterschema VERSION 0.0.1 LANGUAGES CXX
   DESCRIPTION "Perform advanced transformations on JSON Schemas"
   HOMEPAGE_URL "https://alterschema.sourcemeta.com")
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
-include(vendor/noa/cmake/noa.cmake)
 
 # Options
 option(ALTERSCHEMA_ENGINE "Build the AlterSchema Engine library" ON)
@@ -14,6 +13,8 @@ option(ALTERSCHEMA_INSTALL "Install the AlterSchema library" ON)
 option(ALTERSCHEMA_ADDRESS_SANITIZER "Build AlterSchema with an address sanitizer" OFF)
 option(ALTERSCHEMA_UNDEFINED_SANITIZER "Build AlterSchema with an undefined behavior sanitizer" OFF)
 
+find_package(Noa REQUIRED)
+
 if(ALTERSCHEMA_INSTALL)
   include(GNUInstallDirs)
   include(CMakePackageConfigHelpers)
@@ -60,7 +61,6 @@ endif()
 
 # Testing
 if(ALTERSCHEMA_TESTS)
-  find_package(GoogleTest REQUIRED)
   enable_testing()
 
   if(ALTERSCHEMA_ENGINE)

DEPENDENCIES

@@ -1,4 +1,4 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
-noa https://github.com/sourcemeta/noa caad2e1ceedf9fd1a18686a6a6d1e2b9757ead75
-jsontoolkit https://github.com/sourcemeta/jsontoolkit 93a921d0f1e99bfdfe14bfd4d2acf5981294080b
+noa https://github.com/sourcemeta/noa a8d36453236abc365f08a76a486f92c84f976fd9
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 60a3862ad0d9642c97685f94aeaed96ab3509690
 googletest https://github.com/google/googletest a7f443b80b105f940225332ed3c31f2790092f47

Makefile

@@ -20,6 +20,10 @@ configure: .always
 compile: .always
 	$(CMAKE) --build ./build --config $(PRESET) --target clang_format
 	$(CMAKE) --build ./build --config $(PRESET) --parallel 4
+	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
+		--component sourcemeta_noa
+	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
+		--component sourcemeta_noa_dev
 	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
 		--component sourcemeta_jsontoolkit
 	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \

cmake/FindNoa.cmake

@@ -0,0 +1,12 @@
+if(NOT Noa_FOUND)
+  if(ALTERSCHEMA_INSTALL)
+    set(NOA_INSTALL ON CACHE BOOL "enable Noa installation")
+  else()
+    set(NOA_INSTALL OFF CACHE BOOL "disable Noa installation")
+  endif()
+
+  set(NOA_GOOGLETEST ${ALTERSCHEMA_TESTS} CACHE BOOL "GoogleTest")
+  set(NOA_GOOGLEBENCHMARK OFF CACHE BOOL "GoogleBenchmark")
+  add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/noa")
+  set(Noa_FOUND ON)
+endif()

test/engine/CMakeLists.txt

@@ -1,14 +1,8 @@
-add_executable(sourcemeta_alterschema_engine_unit
-  transformer_test.cc rule_test.cc bundle_test.cc rules.h)
-noa_add_default_options(PRIVATE sourcemeta_alterschema_engine_unit)
-target_link_libraries(sourcemeta_alterschema_engine_unit
-  PRIVATE GTest::gtest)
-target_link_libraries(sourcemeta_alterschema_engine_unit
-  PRIVATE GTest::gtest_main)
+noa_googletest(NAMESPACE sourcemeta PROJECT alterschema NAME engine
+  FOLDER "AlterSchema/Engine"
+  SOURCES transformer_test.cc rule_test.cc bundle_test.cc rules.h)
+
 target_link_libraries(sourcemeta_alterschema_engine_unit
   PRIVATE sourcemeta::jsontoolkit::json)
 target_link_libraries(sourcemeta_alterschema_engine_unit
   PRIVATE sourcemeta::alterschema::engine)
-add_test(NAME Engine COMMAND sourcemeta_alterschema_engine_unit --gtest_brief=1)
-set_target_properties(sourcemeta_alterschema_engine_unit
-  PROPERTIES FOLDER "AlterSchema/Engine")

test/linter/CMakeLists.txt

@@ -1,26 +1,20 @@
-add_executable(sourcemeta_alterschema_linter_unit
-  2020_12_test.cc
-  2019_09_test.cc
-  draft7_test.cc
-  draft6_test.cc
-  draft4_test.cc
-  draft3_test.cc
-  draft2_test.cc
-  draft1_test.cc
-  draft0_test.cc
-  utils.h)
+noa_googletest(NAMESPACE sourcemeta PROJECT alterschema NAME linter
+  FOLDER "AlterSchema/Linter"
+  SOURCES
+    2020_12_test.cc
+    2019_09_test.cc
+    draft7_test.cc
+    draft6_test.cc
+    draft4_test.cc
+    draft3_test.cc
+    draft2_test.cc
+    draft1_test.cc
+    draft0_test.cc
+    utils.h)
 
-noa_add_default_options(PRIVATE sourcemeta_alterschema_linter_unit)
-target_link_libraries(sourcemeta_alterschema_linter_unit
-  PRIVATE GTest::gtest)
-target_link_libraries(sourcemeta_alterschema_linter_unit
-  PRIVATE GTest::gtest_main)
 target_link_libraries(sourcemeta_alterschema_linter_unit
   PRIVATE sourcemeta::jsontoolkit::json)
 target_link_libraries(sourcemeta_alterschema_linter_unit
   PRIVATE sourcemeta::alterschema::engine)
 target_link_libraries(sourcemeta_alterschema_linter_unit
   PRIVATE sourcemeta::alterschema::linter)
-add_test(NAME Linter COMMAND sourcemeta_alterschema_linter_unit --gtest_brief=1)
-set_target_properties(sourcemeta_alterschema_linter_unit
-  PROPERTIES FOLDER "AlterSchema/Linter")