diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-02-04 15:50:10 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2020-02-04 15:50:10 -0800 |
| commit | 6f66ad14fe9da11d4bf50f5b25b4da86ed971c53 (patch) | |
| tree | 0f5dbcd1719cd6a8e486c4058cfefd607d58aa6c /ports/jsoncpp/portfile.cmake | |
| parent | d502f061bb3ee0258d6453acbf258b9e5d93d564 (diff) | |
| parent | d808514c9df44bb97d6eccff952bfe8ec4e156f7 (diff) | |
| download | vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.tar.gz vcpkg-6f66ad14fe9da11d4bf50f5b25b4da86ed971c53.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
Diffstat (limited to 'ports/jsoncpp/portfile.cmake')
| -rw-r--r-- | ports/jsoncpp/portfile.cmake | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/ports/jsoncpp/portfile.cmake b/ports/jsoncpp/portfile.cmake index 3e00476d2..3324ab985 100644 --- a/ports/jsoncpp/portfile.cmake +++ b/ports/jsoncpp/portfile.cmake @@ -1,28 +1,29 @@ -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-source-parsers/jsoncpp - REF 1.9.1 - SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766 + REF 1.9.2 + SHA512 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640 HEAD_REF master + PATCHES + allow-disable-examples.patch ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(JSONCPP_STATIC OFF) - set(JSONCPP_DYNAMIC ON) -else() +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(JSONCPP_STATIC ON) - set(JSONCPP_DYNAMIC OFF) +else() + set(JSONCPP_STATIC OFF) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE - OPTIONS -DJSONCPP_WITH_CMAKE_PACKAGE:BOOL=ON - -DBUILD_STATIC_LIBS:BOOL=${JSONCPP_STATIC} - -DJSONCPP_WITH_PKGCONFIG_SUPPORT:BOOL=OFF - -DJSONCPP_WITH_TESTS:BOOL=OFF + OPTIONS + -DJSONCPP_WITH_CMAKE_PACKAGE=ON + -DBUILD_STATIC_LIBS=${JSONCPP_STATIC} + -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF + -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF + -DJSONCPP_WITH_TESTS=OFF + -DJSONCPP_WITH_EXAMPLE=OFF ) vcpkg_install_cmake() |