Merge pull request #520 from 1480c1/nhjson

json: add support for using an external nlohmann_json

Author: adamjw24

CMakeLists.txt

@@ -173,7 +173,9 @@ set( VVENC_ENABLE_BUILD_TYPE_POSTFIX        OFF CACHE BOOL   "Enable or disable
 
 set( VVENC_ENABLE_LINK_TIME_OPT             ON  CACHE BOOL   "Enable link time optimization for release and profile builds" )
 
-set( VVENC_ENABLE_THIRDPARTY_JSON           ON  CACHE BOOL   "Enable use of thirdparty json library" )
+set( VVENC_ENABLE_THIRDPARTY_JSON           ON  CACHE STRING "Enable use of thirdparty json library, pass in SYSTEM to rely on an external nlohmann_json" )
+
+set_property( CACHE VVENC_ENABLE_THIRDPARTY_JSON PROPERTY STRINGS OFF SYSTEM ON )
 
 set( VVENC_INSTALL_FULLFEATURE_APP          OFF CACHE BOOL   "Install the full-feature app: vvencFFapp" )
 
@@ -368,10 +370,20 @@ if( CCACHE_FOUND )
   set_property( GLOBAL PROPERTY RULE_LAUNCH_LINK ccache )
 endif()
 
-
+# handle thirdparty json
 if( VVENC_ENABLE_THIRDPARTY_JSON )
+  string( TOUPPER "${VVENC_ENABLE_THIRDPARTY_JSON}" VVENC_ENABLE_THIRDPARTY_JSON )
+  message( STATUS "VVENC_ENABLE_THIRDPARTY_JSON: ${VVENC_ENABLE_THIRDPARTY_JSON}" )
   set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVVENC_ENABLE_THIRDPARTY_JSON" )
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVVENC_ENABLE_THIRDPARTY_JSON" )
+  if ( VVENC_ENABLE_THIRDPARTY_JSON STREQUAL "SYSTEM" )
+    find_package( nlohmann_json REQUIRED ) # Provides nlohmann_json::nlohmann_json
+  elseif( NOT TARGET nlohmann_json::nlohmann_json ) # Implies either ON, TRUE, or 1
+    add_library( nlohmann_json::nlohmann_json INTERFACE IMPORTED )
+    set_target_properties( nlohmann_json::nlohmann_json PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${PROJECT_SOURCE_DIR}/thirdparty/nlohmann_json/single_include )
+  endif()
+else()
+  message( STATUS "VVENC_ENABLE_THIRDPARTY_JSON is disabled" )
 endif()
 
 # handle rpath correctly

Makefile

@@ -50,8 +50,8 @@ ifneq ($(disable-lto),)
 CONFIG_OPTIONS += -DVVENC_ENABLE_LINK_TIME_OPT=OFF
 endif
 
-ifneq ($(disable-json),)
-CONFIG_OPTIONS += -DVVENC_ENABLE_THIRDPARTY_JSON=OFF
+ifneq ($(enable-json),)
+CONFIG_OPTIONS += -DVVENC_ENABLE_THIRDPARTY_JSON=${enable-json}
 endif
 
 ifneq ($(enable-build-type-postfix),)

source/App/vvencFFapp/CMakeLists.txt

@@ -38,6 +38,9 @@ target_compile_options( ${EXE_NAME} PRIVATE $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CX
 
 target_include_directories( ${EXE_NAME} PRIVATE ../../Lib )
 target_link_libraries( ${EXE_NAME} Threads::Threads vvenc )
+if( TARGET nlohmann_json::nlohmann_json )
+  target_link_libraries( ${EXE_NAME} nlohmann_json::nlohmann_json )
+endif()
 
 # example: place header files in different folders
 source_group( "Header Files"   FILES ${INC_FILES} )

source/App/vvencapp/CMakeLists.txt

@@ -35,6 +35,9 @@ target_compile_options( ${EXE_NAME} PRIVATE $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CX
 
 target_include_directories( ${EXE_NAME} PRIVATE ../../Lib )
 target_link_libraries( ${EXE_NAME} Threads::Threads vvenc )
+if( TARGET nlohmann_json::nlohmann_json )
+  target_link_libraries( ${EXE_NAME} nlohmann_json::nlohmann_json )
+endif()
 
 # example: place header files in different folders
 source_group( "Header Files"   FILES ${INC_FILES} )

source/Lib/EncoderLib/RateCtrl.cpp

@@ -45,7 +45,7 @@ POSSIBILITY OF SUCH DAMAGE.
     \brief    Rate control manager class
 */
 #ifdef VVENC_ENABLE_THIRDPARTY_JSON
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 #endif
 
 #include "vvenc/version.h"

source/Lib/apputils/LogoRenderer.h

@@ -58,7 +58,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "FileIOHelper.h"
 
 #ifdef VVENC_ENABLE_THIRDPARTY_JSON
-#include "../../../thirdparty/nlohmann_json/single_include/nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 using nlohmann::json;
 #endif
 

source/Lib/vvenc/CMakeLists.txt

@@ -134,6 +134,10 @@ if( VVENC_ENABLE_X86_SIMD )
                                               INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL     OFF )
 
   set_target_properties( ${LIB_NAME}_x86_simd PROPERTIES FOLDER lib )
+
+  if( TARGET nlohmann_json::nlohmann_json )
+    target_link_libraries( ${LIB_NAME}_x86_simd PRIVATE nlohmann_json::nlohmann_json )
+  endif()
 endif()
 
 if( VVENC_ENABLE_ARM_SIMD )
@@ -170,6 +174,10 @@ if( VVENC_ENABLE_ARM_SIMD )
                                               INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL     OFF )
 
   set_target_properties( ${LIB_NAME}_arm_simd PROPERTIES FOLDER lib )
+
+  if( TARGET nlohmann_json::nlohmann_json )
+    target_link_libraries( ${LIB_NAME}_arm_simd PRIVATE nlohmann_json::nlohmann_json )
+  endif()
 endif()
 
 # set resource file for MSVC compilers
@@ -187,11 +195,8 @@ if( CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0 )
   target_compile_options( ${LIB_NAME} PRIVATE $<$<CXX_COMPILER_ID:GNU>: -Wno-array-bounds> )
 endif()
 
-
-if( VVENC_ENABLE_THIRDPARTY_JSON )
-  set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVVENC_ENABLE_THIRDPARTY_JSON" )
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVVENC_ENABLE_THIRDPARTY_JSON" )
-  target_include_directories( ${LIB_NAME} PRIVATE ../../../thirdparty/nlohmann_json/single_include )
+if( TARGET nlohmann_json::nlohmann_json )
+  target_link_libraries( ${LIB_NAME} PRIVATE nlohmann_json::nlohmann_json )
 endif()
 
 if( TARGET INTEL_ITT)

test/vvenc_unit_test/CMakeLists.txt

@@ -28,6 +28,9 @@ target_compile_options( ${EXE_NAME} PRIVATE $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CX
 
 target_include_directories( ${EXE_NAME} PRIVATE ${VVENC_LIB_DIR} )
 target_link_libraries( ${EXE_NAME} Threads::Threads vvenc )
+if( TARGET nlohmann_json::nlohmann_json )
+  target_link_libraries( ${EXE_NAME} nlohmann_json::nlohmann_json )
+endif()
 # example: place header files in different folders
 source_group( "Header Files"   FILES ${INC_FILES} )
 source_group( "Resource Files" FILES ${RESOURCE_FILE} )