diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-05-29 04:07:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 13:07:36 -0700 |
| commit | 4312808883c5b84652cf08329d96da6a53e17974 (patch) | |
| tree | bafd9404fb850f486694afcc6231dcac3fd8844f | |
| parent | d9b4acf02d8c784927f89d23edb677408ec428af (diff) | |
| download | vcpkg-4312808883c5b84652cf08329d96da6a53e17974.tar.gz vcpkg-4312808883c5b84652cf08329d96da6a53e17974.zip | |
[vcpkg baseline] Fix baseline failures (#11612)
* [vcpkg baseline] Fix baseline failures
* Update the target check
| -rw-r--r-- | ports/dmlc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpq/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpq/vcpkg-cmake-wrapper.cmake | 4 | ||||
| -rw-r--r-- | ports/opencc/CONTROL | 2 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 6 |
5 files changed, 12 insertions, 4 deletions
diff --git a/ports/dmlc/CONTROL b/ports/dmlc/CONTROL index 9a0c2c370..c75a86da6 100644 --- a/ports/dmlc/CONTROL +++ b/ports/dmlc/CONTROL @@ -1,5 +1,5 @@ Source: dmlc -Version: 2019-08-12-2 +Version: 2019-08-12-3 Homepage: https://github.com/dmlc/dmlc-core Description: DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries. Default-Features: openmp diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL index 979cd7901..8b2c9f249 100644 --- a/ports/libpq/CONTROL +++ b/ports/libpq/CONTROL @@ -1,5 +1,5 @@ Source: libpq -Version: 12.2 +Version: 12.2-1 Build-Depends: libpq[bonjour] (osx) Supports: !uwp Homepage: https://www.postgresql.org/ diff --git a/ports/libpq/vcpkg-cmake-wrapper.cmake b/ports/libpq/vcpkg-cmake-wrapper.cmake index 29a81eedd..5fd40d26c 100644 --- a/ports/libpq/vcpkg-cmake-wrapper.cmake +++ b/ports/libpq/vcpkg-cmake-wrapper.cmake @@ -10,6 +10,8 @@ if(PostgreSQL_FOUND) find_library(PostgreSQL_DL_LIBRARY NAMES dl)
if(PostgreSQL_DL_LIBRARY)
list(APPEND PostgreSQL_LIBRARIES "dl")
- set_property(TARGET PostgreSQL::PostgreSQL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl")
+ if(TARGET PostgreSQL::PostgreSQL)
+ set_property(TARGET PostgreSQL::PostgreSQL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl")
+ endif()
endif()
endif()
diff --git a/ports/opencc/CONTROL b/ports/opencc/CONTROL index 7b6ee7df4..b59adc760 100644 --- a/ports/opencc/CONTROL +++ b/ports/opencc/CONTROL @@ -1,5 +1,5 @@ Source: opencc
-Version: 2020-04-26-3
+Version: 2020-04-26-4
Description: A project for conversion between Traditional and Simplified Chinese
Homepage: https://github.com/BYVoid/OpenCC
Supports: !(arm|arm64|uwp)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3858c8587..a52034597 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -215,8 +215,14 @@ chakracore:x64-osx=fail chakracore:x64-uwp=fail
chakracore:x64-windows-static=fail
# DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy)
+charls:arm64-windows=skip
+charls:arm-uwp=skip
charls:x64-linux=skip
charls:x64-osx=skip
+charls:x64-uwp=skip
+charls:x64-windows=skip
+charls:x64-windows-static=skip
+charls:x86-windows=skip
chartdir:arm64-windows=fail
chartdir:arm-uwp=fail
chartdir:x64-uwp=fail
|