[jsoncpp] Update to latest revision (#13776)

* [jsoncpp] Update to latest revision

* Fix typo issue

3 files changed, 6 insertions, 37 deletions

diff --git a/ports/jsoncpp/CONTROL b/ports/jsoncpp/CONTROL
index fb5951d60..012e45b9d 100644
--- a/ports/jsoncpp/CONTROL
+++ b/ports/jsoncpp/CONTROL
@@ -1,4 +1,4 @@
 Source: jsoncpp

-Version: 1.9.2

+Version: 1.9.4

 Homepage: https://github.com/open-source-parsers/jsoncpp

 Description: jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human.

diff --git a/ports/jsoncpp/allow-disable-examples.patch b/ports/jsoncpp/allow-disable-examples.patch
deleted file mode 100644
index 83413db90..000000000
--- a/ports/jsoncpp/allow-disable-examples.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a7d3ef..4e06331 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -82,6 +82,7 @@ option(JSONCPP_WITH_WARNING_AS_ERROR "Force compilation to fail if a warning occ
- option(JSONCPP_WITH_STRICT_ISO "Issue all the warnings demanded by strict ISO C and ISO C++" ON)
- option(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON)
- option(JSONCPP_WITH_CMAKE_PACKAGE "Generate and install cmake package files" ON)
-+option(JSONCPP_WITH_EXAMPLE "Compile JsonCpp example" OFF)
- option(BUILD_SHARED_LIBS "Build jsoncpp_lib as a shared library." OFF)
- 
- # Enable runtime search path support for dynamic libraries on OSX
-@@ -228,4 +229,6 @@ add_subdirectory( src )
- add_subdirectory( include )
- 
- #install the example
--add_subdirectory( example )
-+if(JSONCPP_WITH_EXAMPLE)
-+  add_subdirectory( example )
-+endif()
diff --git a/ports/jsoncpp/portfile.cmake b/ports/jsoncpp/portfile.cmake
index 3324ab985..e722bde64 100644
--- a/ports/jsoncpp/portfile.cmake
+++ b/ports/jsoncpp/portfile.cmake
@@ -1,18 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open-source-parsers/jsoncpp
-    REF 1.9.2
-    SHA512 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640
+    REF 9059f5cad030ba11d37818847443a53918c327b1 # 1.9.4
+    SHA512 8062c83cad9dc453f1eb4886e63e054570e0f29dcd6594330d3b3628ba994915e26e08690cd28118805a766be200ac99ad4fbc131db3af895122a8d1bd87ef31
     HEAD_REF master
-    PATCHES
-        allow-disable-examples.patch
 )
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(JSONCPP_STATIC ON)
-else()
-    set(JSONCPP_STATIC OFF)
-endif()
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSONCPP_STATIC)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -28,15 +22,10 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-# Fix CMake files
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/jsoncpp)
 
-# Remove includes in debug
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-# Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jsoncpp)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/jsoncpp/LICENSE ${CURRENT_PACKAGES_DIR}/share/jsoncpp/copyright)
-
-# Copy pdb files
 vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)