diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/json11 | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/json11')
| -rw-r--r-- | ports/json11/CONTROL | 6 | ||||
| -rw-r--r-- | ports/json11/portfile.cmake | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/ports/json11/CONTROL b/ports/json11/CONTROL index 3145a079a..d624f9e7b 100644 --- a/ports/json11/CONTROL +++ b/ports/json11/CONTROL @@ -1,3 +1,3 @@ -Source: json11 -Version: 2017-06-20 -Description: json11 is a tiny JSON library for C++11, providing JSON parsing and serialization. +Source: json11
+Version: 2017-06-20-1
+Description: json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.
diff --git a/ports/json11/portfile.cmake b/ports/json11/portfile.cmake index 533c0457c..f6592693a 100644 --- a/ports/json11/portfile.cmake +++ b/ports/json11/portfile.cmake @@ -1,4 +1,7 @@ include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dropbox/json11 @@ -7,11 +10,6 @@ vcpkg_from_github( HEAD_REF master ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(STATUS "Warning: Dynamic building not supported.") - set(VCPKG_LIBRARY_LINKAGE static) -endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA |