mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 04:19:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix baseline error (#10051)

Browse Source 
* Fix osx baseline

* fix osg configure issue

* re-trigger ci test

* re-trigger ci test

* [osg] Revert changes with osg and temporarily skip osg detection

* trigger ci test

* update baseline

Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
This commit is contained in:
Jack·Boos·Yu 2020-02-20 08:45:58 +08:00 committed by GitHub
parent 1be75a28bf
commit 9db90b397d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/eathread/CONTROL
View File

@ -1,5 +1,5 @@
Source: eathread
Version: 1.32.09
Version: 1.32.09-1
Homepage: https://github.com/electronicarts/EAThread
Description: Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms.
Build-Depends: eabase, eastl

2
ports/eathread/portfile.cmake
View File

@ -29,5 +29,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_copy_pdbs()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/eathread RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/3RDPARTYLICENSES.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/eathread)

2
ports/geotrans/CONTROL
View File

@ -1,3 +1,3 @@
Source: geotrans
Version: 3.7-1
Version: 3.8
Description: Geotrans is a library that allows you convert geographic coordinates among a wide variety of coordinate systems, map projections, and datums.

2
ports/geotrans/portfile.cmake
View File

@ -36,4 +36,4 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${P
file(INSTALL ${SOURCE_PATH}/GEOTRANS3/docs/MSP_Geotrans_Terms_Of_Use.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
# Install the geo model data
file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})

2
ports/llvm/CONTROL
View File

@ -1,5 +1,5 @@
Source: llvm
Version: 8.0.0-3
Version: 8.0.0-4
Homepage: https://llvm.org/
Description: The LLVM Compiler Infrastructure
Build-Depends: atlmfc (windows)

2
ports/llvm/portfile.cmake
View File

@ -129,4 +129,4 @@ if(NOT MACHOFILES)
endif()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/llvm RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/qt5-base/CONTROL
View File

@ -1,5 +1,5 @@
Source: qt5-base
Version: 5.12.5-9
Version: 5.12.5-10
Homepage: https://www.qt.io/
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)

2
ports/qt5-base/portfile.cmake
View File

@ -340,4 +340,4 @@ if(QT_BUILD_LATEST)
DESTINATION
${CURRENT_PACKAGES_DIR}/share/qt5
)
endif()
endif()

2
ports/qt5-tools/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-tools
Version: 5.12.5-3
Version: 5.12.5-4
Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
Build-Depends: qt5-base, qt5-declarative, qt5-activeqt (windows)

2
ports/qt5-tools/portfile.cmake
View File

@ -1,5 +1,7 @@
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
qt_submodule_installation()
if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms")
endif()

2
ports/xlnt/CONTROL
View File

@ -1,4 +1,4 @@
Source: xlnt
Version: 1.4.0
Version: 1.4.0-1
Homepage: https://github.com/tfussell/xlnt
Description: Cross-platform user-friendly xlsx library for C++14

4
ports/xlnt/portfile.cmake
View File

@ -7,8 +7,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tfussell/xlnt
REF v1.4.0
SHA512 74abbee97994098fb7d8fd0839929db74fe01b8428f8bdb8edd28340d3b3ed04d4c7d6dd5d886ae766054ff1b0fe9a8275098a1462e7a5146ff09f1cdb063360
REF 85e6878cc41d4c5ad002e961dc1fe35e41f936b6 # v1.4.0
SHA512 335198fbcc1b3028e38bced4ee26047047b02372b6c52727a64c0cab6db19cc31be8ac6c08e96f415875a181d6f717082220b0f63f08ef6ac194927e2184a9df
HEAD_REF master
PATCHES
${win_patch}

3
scripts/ci.baseline.txt
View File

@ -1327,10 +1327,11 @@ opusfile:x64-uwp=fail
orc:x64-linux=ignore
orocos-kdl:arm-uwp=fail
orocos-kdl:x64-uwp=fail
osg:x86-windows=skip
osg:x64-windows=skip
osgearth:x64-osx=fail
osgearth:x64-linux=fail
osgearth:x64-windows-static=fail
osg-qt:x64-linux=fail
osg-qt:x64-windows-static=fail
otl:x64-windows=ignore
otl:x64-windows-static=ignore