[DLStreamer] Update JSON dependencies with FetchContent (#1530)

Author: yunowo

libraries/dl-streamer/CMakeLists.txt

@@ -67,33 +67,6 @@ function (set_compile_flags TARGET)
     endif()
 endfunction(set_compile_flags)
 
-# FIXME: replace with file(SIZE ...) when cmake version >= 3.14
-function(file_size FILE SIZE)
-    file(READ "${FILE}" CONTENT HEX)
-    string(LENGTH "${CONTENT}" CONTENT_LENGTH)
-    set(${SIZE} ${CONTENT_LENGTH} PARENT_SCOPE)
-endfunction(file_size)
-
-function(download_and_verify URL TARGET TARGET_NAME)
-    if(NOT EXISTS ${TARGET})
-        file(DOWNLOAD ${URL} ${TARGET} SHOW_PROGRESS STATUS DOWNLOAD_STATUS)
-        list(GET DOWNLOAD_STATUS 0 RETURN_CODE)
-        list(GET DOWNLOAD_STATUS 1 MESSAGE)
-        if(NOT ${RETURN_CODE} EQUAL 0)
-            file(REMOVE ${TARGET})
-            message(FATAL_ERROR "Unable to download ${TARGET_NAME}: ${MESSAGE}")
-        endif()
-    endif()
-
-    file_size(${TARGET} FILE_SIZE)
-    if(${FILE_SIZE} EQUAL 0)
-        file(REMOVE ${TARGET})
-        message(FATAL_ERROR "Invalid ${TARGET_NAME} downloaded")
-    endif()
-
-    message(STATUS "Download of ${TARGET_NAME} is successful")
-endfunction(download_and_verify)
-
 # Set output paths
 if (NOT(BIN_FOLDER))
     if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")

libraries/dl-streamer/src/gst/bins/model_proc/json_reader.cpp

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  ******************************************************************************/
@@ -96,6 +96,13 @@ GValue JsonReader::convertToGValue(const nlohmann::json::reference value, const
             // }
             break;
         }
+        case nlohmann::json::value_t::binary: {
+            g_value_init(&gvalue, G_TYPE_BYTES);
+            const auto &binary_data = value.get_binary();
+            GBytes *bytes = g_bytes_new(binary_data.data(), binary_data.size());
+            g_value_take_boxed(&gvalue, bytes);
+            break;
+        }
         case nlohmann::json::value_t::discarded:
         case nlohmann::json::value_t::null:
             break;

libraries/dl-streamer/src/gst/bins/model_proc/json_reader.h

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  ******************************************************************************/
@@ -8,7 +8,7 @@
 
 #include <fstream>
 #include <gst/gst.h>
-#include <json-schema.hpp>
+#include <nlohmann/json-schema.hpp>
 #include <nlohmann/json.hpp>
 #include <string>
 

libraries/dl-streamer/src/monolithic/gst/elements/gvametapublish/mqtt/gvametapublishmqtt.cpp

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: MIT
  ******************************************************************************/
 
-#include "../../../../../../thirdparty/json/nlohmann/json.hpp"
 #include <fstream>
 #include <iostream>
+#include <nlohmann/json.hpp>
 using json = nlohmann::json;
 
 #include "gvametapublishmqtt.hpp"

libraries/dl-streamer/thirdparty/CMakeLists.txt

@@ -4,6 +4,13 @@
 # SPDX-License-Identifier: MIT
 # ==============================================================================
 
+include(FetchContent)
+
+# Support DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24:
+if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+    cmake_policy(SET CMP0135 NEW)
+endif()
+
 add_subdirectory(itt)
 
 if(${ENABLE_TESTS})
@@ -21,40 +28,22 @@ if(${ENABLE_TESTS})
         endif()
     endif()
 
-    add_subdirectory(fff)
-    set(FFF_SOURCE "https://raw.githubusercontent.com/meekrosoft/fff/v1.0/fff.h")
-    set(FFF_PATH "${CMAKE_CURRENT_SOURCE_DIR}/fff/include/")
-    set(FFF_HEADER "${FFF_PATH}/fff.h")
-
-    download_and_verify(${FFF_SOURCE} ${FFF_HEADER} "fff header")
-endif()
-
-# Populate thirdparty/json dependency
-set(JSONCONVERT_SOURCE "https://github.com/nlohmann/json/releases/download/v3.7.3/json.hpp")
-set(JSONCONVERT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/json/nlohmann")
-set(JSONCONVERT_HEADER "${JSONCONVERT_PATH}/json.hpp")
-set(JSONVALIDATOR_SOURCE "https://github.com/pboettch/json-schema-validator/archive/2.0.0.tar.gz")
-set(JSONVALIDATOR_PATH "${CMAKE_CURRENT_SOURCE_DIR}/json/pboettch")
-set(JSONVALIDATOR_TAR "${JSONVALIDATOR_PATH}/jsonvalidator.tar.gz")
-set(JSONVALIDATOR_HEADER "${JSONVALIDATOR_PATH}/json-schema-validator-2.0.0/src/json-schema.hpp")
-
-download_and_verify(${JSONCONVERT_SOURCE} ${JSONCONVERT_HEADER} "JSON header")
-
-if(NOT EXISTS ${JSONVALIDATOR_HEADER})
-    download_and_verify(${JSONVALIDATOR_SOURCE} ${JSONVALIDATOR_TAR} "JSON validator")
-
-    execute_process(
-        COMMAND ${CMAKE_COMMAND} -E tar xzf ${JSONVALIDATOR_TAR}
-        WORKING_DIRECTORY ${JSONVALIDATOR_PATH}
-    )
-    # fix build issue
-    execute_process(
-        COMMAND sed -i "s/&c : s/c : s/g" json-schema-validator-2.0.0/src/json-validator.cpp
-        WORKING_DIRECTORY ${JSONVALIDATOR_PATH}
+    FetchContent_Declare(
+        fff
+        URL https://github.com/meekrosoft/fff/archive/5111c61e1ef7848e3afd3550044a8cf4405f4199.zip
     )
+    FetchContent_MakeAvailable(fff)
 endif()
 
-add_subdirectory(json)
+# Populate json dependency
+set(nlohmann_json_VERSION v3.12.0)
+FetchContent_Declare(
+    json_schema_validator
+    URL https://github.com/pboettch/json-schema-validator/archive/2.4.0.tar.gz
+)
+FetchContent_MakeAvailable(json_schema_validator)
+add_library(json-hpp ALIAS nlohmann_json)
+add_library(json-schema-validator ALIAS nlohmann_json_schema_validator)
 
 # Hint compiler about location of the header file generated.
 include_directories(${CMAKE_CURRENT_BINARY_DIR})