From c8a13ba145b877010adcf277f1a11ee80bda7d08 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Fri, 4 Oct 2024 18:20:44 -0400 Subject: [PATCH] Upgrade JSON Toolkit to `b5c8f63fbc4b4b7a9cd4bdd71774d89db6ee2a99` (#170) Signed-off-by: Juan Cruz Viotti --- DEPENDENCIES | 2 +- vendor/jsontoolkit/vendor/noa/cmake/noa/library.cmake | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 5a61bfb4..26a7e506 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,6 +1,6 @@ vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4 noa https://github.com/sourcemeta/noa 517e88aef5981b88ac6bb8caff15d17dffcb4320 -jsontoolkit https://github.com/sourcemeta/jsontoolkit 3e3ac593146af68e9bd01f3418a263821f8f47cc +jsontoolkit https://github.com/sourcemeta/jsontoolkit b5c8f63fbc4b4b7a9cd4bdd71774d89db6ee2a99 hydra https://github.com/sourcemeta/hydra 3c53d3fdef79e9ba603d48470a508cc45472a0dc alterschema https://github.com/sourcemeta/alterschema 744cf03a950b681a61f1f4cf6a7bb55bc52836c9 jsonbinpack https://github.com/sourcemeta/jsonbinpack 43d53dd32c432333deb1aea147095ed8707b5f11 diff --git a/vendor/jsontoolkit/vendor/noa/cmake/noa/library.cmake b/vendor/jsontoolkit/vendor/noa/cmake/noa/library.cmake index 56e152b6..05d57748 100644 --- a/vendor/jsontoolkit/vendor/noa/cmake/noa/library.cmake +++ b/vendor/jsontoolkit/vendor/noa/cmake/noa/library.cmake @@ -22,13 +22,14 @@ function(noa_library) if(NOA_LIBRARY_SOURCES) set(ABSOLUTE_PRIVATE_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/${NOA_LIBRARY_NAME}_export.h") - foreach(private_header IN LISTS NOA_LIBRARY_PRIVATE_HEADERS) - list(APPEND ABSOLUTE_PRIVATE_HEADERS "${INCLUDE_PREFIX}/${NOA_LIBRARY_NAME}_${private_header}") - endforeach() else() set(ABSOLUTE_PRIVATE_HEADERS) endif() + foreach(private_header IN LISTS NOA_LIBRARY_PRIVATE_HEADERS) + list(APPEND ABSOLUTE_PRIVATE_HEADERS "${INCLUDE_PREFIX}/${NOA_LIBRARY_NAME}_${private_header}") + endforeach() + if(NOA_LIBRARY_NAMESPACE) set(TARGET_NAME "${NOA_LIBRARY_NAMESPACE}_${NOA_LIBRARY_PROJECT}_${NOA_LIBRARY_NAME}") set(ALIAS_NAME "${NOA_LIBRARY_NAMESPACE}::${NOA_LIBRARY_PROJECT}::${NOA_LIBRARY_NAME}")