Update googletest and utfcpp

robertoraggi · robertoraggi · commit 03f9596ef088 · 2025-11-22T09:55:06.000+01:00
Signed-off-by: Roberto Raggi &lt;roberto.raggi@gmail.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -72,8 +72,9 @@ if(CXX_BUILD_TESTS)
     set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
 
     FetchContent_Declare(
-    googletest
-    URL https://github.com/google/googletest/archive/refs/tags/v1.15.2.tar.gz
+        googletest
+        URL         https://github.com/google/googletest/archive/refs/tags/v1.17.0.tar.gz
+        URL_HASH    SHA256=65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c
     )
 
     FetchContent_MakeAvailable(googletest)
@@ -87,13 +88,15 @@ endif()
 #
 FetchContent_Declare(
     utfcpp
-    URL                 https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.5.tar.gz
-    PATCH_COMMAND       patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patches/utfcpp.patch
+    URL                 https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.8.tar.gz
+    URL_HASH            SHA256=f808b26d8c3a59def27fea207182ece77a8930bd121a69f80d328ecf3cfef925
 )
 
 FetchContent_MakeAvailable(utfcpp)
 FetchContent_GetProperties(utfcpp)
 
+set(UTFCPP_INCLUDE_DIRS "${utfcpp_SOURCE_DIR}/source")
+
 #
 # nlohmann_json
 #
diff --git a/patches/utfcpp.patch b/patches/utfcpp.patch
diff --git a/src/parser/CMakeLists.txt b/src/parser/CMakeLists.txt
@@ -102,8 +102,8 @@ if (EMSCRIPTEN)
     target_compile_options(cxx-parser PUBLIC -fno-exceptions)
 endif()
 
-target_link_libraries(cxx-parser
-    PUBLIC  $<BUILD_INTERFACE:utf8cpp>
+target_include_directories(cxx-parser PUBLIC
+    $<BUILD_INTERFACE:${UTFCPP_INCLUDE_DIRS}>
 )
 
 if (CXX_ENABLE_FLATBUFFERS)

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,9 @@ if(CXX_BUILD_TESTS)`
`72`	`72`	`set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)`
`73`	`73`
`74`	`74`	`FetchContent_Declare(`
`75`		`- googletest`
`76`		`- URL https://github.com/google/googletest/archive/refs/tags/v1.15.2.tar.gz`
	`75`	`+ googletest`
	`76`	`+ URL https://github.com/google/googletest/archive/refs/tags/v1.17.0.tar.gz`
	`77`	`+ URL_HASH SHA256=65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c`
`77`	`78`	`)`
`78`	`79`
`79`	`80`	`FetchContent_MakeAvailable(googletest)`
`@@ -87,13 +88,15 @@ endif()`
`87`	`88`	`#`
`88`	`89`	`FetchContent_Declare(`
`89`	`90`	`utfcpp`
`90`		`- URL https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.5.tar.gz`
`91`		`- PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patches/utfcpp.patch`
	`91`	`+ URL https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.8.tar.gz`
	`92`	`+ URL_HASH SHA256=f808b26d8c3a59def27fea207182ece77a8930bd121a69f80d328ecf3cfef925`
`92`	`93`	`)`
`93`	`94`
`94`	`95`	`FetchContent_MakeAvailable(utfcpp)`
`95`	`96`	`FetchContent_GetProperties(utfcpp)`
`96`	`97`
	`98`	`+set(UTFCPP_INCLUDE_DIRS "${utfcpp_SOURCE_DIR}/source")`
	`99`	`+`
`97`	`100`	`#`
`98`	`101`	`# nlohmann_json`
`99`	`102`	`#`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,8 @@ if (EMSCRIPTEN)`
`102`	`102`	`target_compile_options(cxx-parser PUBLIC -fno-exceptions)`
`103`	`103`	`endif()`
`104`	`104`
`105`		`-target_link_libraries(cxx-parser`
`106`		`- PUBLIC $<BUILD_INTERFACE:utf8cpp>`
	`105`	`+target_include_directories(cxx-parser PUBLIC`
	`106`	`+ $<BUILD_INTERFACE:${UTFCPP_INCLUDE_DIRS}>`
`107`	`107`	`)`
`108`	`108`
`109`	`109`	`if (CXX_ENABLE_FLATBUFFERS)`