diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2020-05-01 02:56:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 17:56:33 -0700 |
| commit | 43d664ab53233acc1afacaefbdc8ece98b75d02a (patch) | |
| tree | a3b7c4f56f3d88a19d79ede77c0d9caca1eadea0 | |
| parent | 400957f8291222642f8f292f535f3a73671cf808 (diff) | |
| download | vcpkg-43d664ab53233acc1afacaefbdc8ece98b75d02a.tar.gz vcpkg-43d664ab53233acc1afacaefbdc8ece98b75d02a.zip | |
[civetweb] Update to version 1.12 (#10591)
| -rw-r--r-- | ports/civetweb/CONTROL | 3 | ||||
| -rw-r--r-- | ports/civetweb/portfile.cmake | 12 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 5 |
3 files changed, 6 insertions, 14 deletions
diff --git a/ports/civetweb/CONTROL b/ports/civetweb/CONTROL index eb9ee3ed0..eb9ef7fd6 100644 --- a/ports/civetweb/CONTROL +++ b/ports/civetweb/CONTROL @@ -1,5 +1,6 @@ Source: civetweb -Version: 2019-07-05-1 +Version: 1.12 +Homepage: https://github.com/civetweb/civetweb Description: Easy to use, powerful, C/C++ embeddable web server. Supports: !uwp diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake index 39c63309b..ee39432b0 100644 --- a/ports/civetweb/portfile.cmake +++ b/ports/civetweb/portfile.cmake @@ -1,16 +1,12 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") -endif() +vcpkg_fail_port_install(MESSAGE "${PORT} does not currently support UWP" ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO civetweb/civetweb - REF 2c1caa6e690bfe3b435a10c372ab2dcd14b872e8 - SHA512 bfd37906f85c10649108f83e755f28f058c0c27b0d597e6eb82f097db7fa043f6014984f1735c904d0e01c8a5e0dc45f1c57c1fb45b08bce78f42539e19160d6 + REF 4b440a339979852d5a51fb11a822952712231c23 # v1.12 + SHA512 02b77cb7140eaab9c7d34461ec2e5ea3354601e369be424a48f4734acbd4f77a450b969ed7a0c0940fcac1900c3d78bae26e29dd6a396189862075781917f428 HEAD_REF master ) @@ -39,6 +35,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/civetweb) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/civetweb/copyright COPYONLY) +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d53fc64e8..3dcc55941 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -233,12 +233,7 @@ chmlib:arm-uwp=fail chmlib:x64-uwp=fail
civetweb:arm64-windows = skip
civetweb:arm-uwp = skip
-civetweb:x64-linux = skip
-civetweb:x64-osx = skip
civetweb:x64-uwp = skip
-civetweb:x64-windows = skip
-civetweb:x64-windows-static = skip
-civetweb:x86-windows = skip
clapack:x64-uwp=fail
clblast:x64-osx=ignore
clblast:x64-linux=fail
|