Get rid of Noa in this project (#1489)

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

Author: jviotti

.github/workflows/ci.yml

@@ -120,12 +120,6 @@ 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_core

CMakeLists.txt

@@ -18,7 +18,7 @@ option(SOURCEMETA_CORE_INSTALL "Install the Sourcemeta Core library" ON)
 option(SOURCEMETA_CORE_ADDRESS_SANITIZER "Build Sourcemeta Core with an address sanitizer" OFF)
 option(SOURCEMETA_CORE_UNDEFINED_SANITIZER "Build Sourcemeta Core with an undefined behavior sanitizer" OFF)
 
-include(./vendor/noa/cmake/noa.cmake)
+include(Sourcemeta)
 
 # TODO: Turn this into a re-usable utility CMake function
 if(SOURCEMETA_CORE_INSTALL)
@@ -74,22 +74,22 @@ if(SOURCEMETA_CORE_EXTENSION_ALTERSCHEMA)
 endif()
 
 if(SOURCEMETA_CORE_ADDRESS_SANITIZER)
-  noa_sanitizer(TYPE address)
+  sourcemeta_sanitizer(TYPE address)
 elseif(SOURCEMETA_CORE_UNDEFINED_SANITIZER)
-  noa_sanitizer(TYPE undefined)
+  sourcemeta_sanitizer(TYPE undefined)
 endif()
 
 if(SOURCEMETA_CORE_DOCS)
-  noa_target_doxygen(CONFIG "${PROJECT_SOURCE_DIR}/doxygen/Doxyfile.in"
+  sourcemeta_target_doxygen(CONFIG "${PROJECT_SOURCE_DIR}/doxygen/Doxyfile.in"
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/website")
 endif()
 
 if(PROJECT_IS_TOP_LEVEL)
-  noa_target_clang_format(SOURCES
+  sourcemeta_target_clang_format(SOURCES
     src/*.h src/*.cc
     benchmark/*.h benchmark/*.cc
     test/*.h test/*.cc)
-  noa_target_clang_tidy(SOURCES
+  sourcemeta_target_clang_tidy(SOURCES
     src/*.h src/*.cc)
 endif()
 

DEPENDENCIES

@@ -1,5 +1,4 @@
 vendorpull https://github.com/sourcemeta/vendorpull 70342aaf458e6cb80baeb5b718901075fc42ede6
-noa https://github.com/sourcemeta/noa b2c8e362a5c4c138eb708603a351df2b2d79a1c9
 jsontestsuite https://github.com/nst/JSONTestSuite d64aefb55228d9584d3e5b2433f720ea8fd00c82
 jsonschema-2020-12 https://github.com/json-schema-org/json-schema-spec 769daad75a9553562333a8937a187741cb708c72
 jsonschema-2019-09 https://github.com/json-schema-org/json-schema-spec 41014ea723120ce70b314d72f863c6929d9f3cfd

Makefile

@@ -20,10 +20,6 @@ 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_core
 	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \

assets/logo.png

@@ -13,7 +13,7 @@ if(SOURCEMETA_CORE_JSONPOINTER)
 endif()
 
 if(BENCHMARK_SOURCES)
-  noa_googlebenchmark(NAMESPACE sourcemeta PROJECT core
+  sourcemeta_googlebenchmark(NAMESPACE sourcemeta PROJECT core
     FOLDER "Core" SOURCES ${BENCHMARK_SOURCES})
 
   target_compile_definitions(sourcemeta_core_benchmark

assets/logo.svg

@@ -124,7 +124,7 @@ if(NOT BoostRegex_FOUND)
 
   target_compile_definitions(boost_regex INTERFACE BOOST_REGEX_STANDALONE)
 
-  if(SOURCEMETA_CORE_UNDEFINED_SANITIZER AND NOA_COMPILER_LLVM)
+  if(SOURCEMETA_CORE_UNDEFINED_SANITIZER AND SOURCEMETA_COMPILER_LLVM)
     # Boost Regex doesn't pass the LLVM Undefined Behavior sanitizer otherwise
     # vendor/boost-regex/include/boost/regex/v5/cpp_regex_traits.hpp:1022:60:
     # runtime error: implicit conversion from type 'unsigned char' of value 128

benchmark/CMakeLists.txt

@@ -16,7 +16,7 @@ if(NOT Yaml_FOUND)
 
   add_library(yaml ${YAML_SOURCES})
 
-  if(NOA_COMPILER_LLVM OR NOA_COMPILER_GCC)
+  if(SOURCEMETA_COMPILER_LLVM OR SOURCEMETA_COMPILER_GCC)
     target_compile_options(yaml PRIVATE -Wno-implicit-function-declaration)
     target_compile_options(yaml PRIVATE -Wno-int-to-pointer-cast)
   endif()

cmake/FindBoostRegex.cmake

@@ -0,0 +1,16 @@
+set(SOURCEMETA_UTILITIES_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/common")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/shim.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/variables.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/defaults.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/compiler/sanitizer.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/compiler/options.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/options/enum.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/commands/copy-file.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/targets/library.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/targets/executable.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/targets/clang-format.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/targets/clang-tidy.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/targets/shellcheck.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/targets/doxygen.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/targets/googletest.cmake")
+include("${SOURCEMETA_UTILITIES_DIRECTORY}/targets/googlebenchmark.cmake")