diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-10-22 07:32:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-21 16:32:07 -0700 |
| commit | 3df2c009df4ee02e78f72679ea15cd3f7fb6cf5b (patch) | |
| tree | b6d97dbe20ace48899f793269c1167dc2e9e2a92 | |
| parent | 51fce8c8d8ebafc9ad314d3d0b242b23e1e15ccd (diff) | |
| download | vcpkg-3df2c009df4ee02e78f72679ea15cd3f7fb6cf5b.tar.gz vcpkg-3df2c009df4ee02e78f72679ea15cd3f7fb6cf5b.zip | |
[libp7-baical] Fix build error (#13540)
| -rw-r--r-- | ports/libp7-baical/CONTROL | 5 | ||||
| -rw-r--r-- | ports/libp7-baical/portfile.cmake | 14 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 8 |
3 files changed, 6 insertions, 21 deletions
diff --git a/ports/libp7-baical/CONTROL b/ports/libp7-baical/CONTROL index 80037450b..179d6d825 100644 --- a/ports/libp7-baical/CONTROL +++ b/ports/libp7-baical/CONTROL @@ -1,5 +1,6 @@ Source: libp7-baical -Version: 4.4-4 +Version: 4.4 +Port-Version: 5 Homepage: https://baical.net/ Description: P7 is a library for high-speed sending telemetry & trace data from application -Supports: !(arm|uwp)
\ No newline at end of file +Supports: !(arm|uwp|osx)
\ No newline at end of file diff --git a/ports/libp7-baical/portfile.cmake b/ports/libp7-baical/portfile.cmake index bae7c896e..d6fc5f9de 100644 --- a/ports/libp7-baical/portfile.cmake +++ b/ports/libp7-baical/portfile.cmake @@ -1,12 +1,4 @@ -include(vcpkg_common_functions) - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm) - message(FATAL_ERROR "libP7 does not support ARM") -endif() - -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "libP7 does not support UWP") -endif() +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx") set(LIBP7_VERSION 4.4) set(LIBP7_HASH 500fefdf6fb01999ddb2accc8309cf8749fb7a65abb98faaf6d71a5ae3da4eac8c00c083905b01f7f6cc973387b605f2c4db0bb007562f76b7ad43b6abe2b91f) @@ -20,6 +12,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -34,5 +27,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/libp7-baical/) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libp7-baical/License.txt ${CURRENT_PACKAGES_DIR}/share/libp7-baical/copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8f1a01495..49fafc396 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -747,14 +747,6 @@ libosip2:x64-uwp=fail libosip2:x64-windows=fail libosip2:x64-windows-static=fail libosip2:x86-windows=fail -libp7-baical:arm64-windows = skip -libp7-baical:arm-uwp = skip -libp7-baical:x64-linux = skip -libp7-baical:x64-osx = skip -libp7-baical:x64-uwp = skip -libp7-baical:x64-windows = skip -libp7-baical:x64-windows-static = skip -libp7-baical:x86-windows = skip libp7client:arm64-windows=fail libp7client:arm-uwp=fail libp7client:x64-linux=fail |