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

[ois] Update to 1.5.1 (#21244)

Browse Source 
* Update ois to 1.5.1

* Update CI baseline

* Fix typo

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Add "supports", remove entries from CI baseline

* Update git-tree hash

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
This commit is contained in:
chausner 2021-11-09 05:43:34 +01:00 committed by GitHub
parent 097eca5664
commit 79a943954d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ports/ois/portfile.cmake
View File

@ -1,31 +1,26 @@
# Automatically fail port install for UWP and ARM. Unsure if it is
# supported by library. See here: https://github.com/wgois/OIS/issues/57
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO wgois/OIS
REF v1.5
SHA512 5ab1dda7c25c1959ccbbb758ea3fda36bd62ad65f46e2c6b418317a5eb39e0bace52a44ae079dfb69fc58c90df54f8e50d589daae1100ec615325363c9d77513
REF v1.5.1
SHA512 20598aef999a70900cb7f75ffaf62059acf8e811822971cb21986b5d25d28dacb79e4b4cf4770c70e00d3c55cdd01ef3e68a77c2dd148677784fc4df38891340
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_fixup_pkgconfig()
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
# Include files should not be duplicated into the /debug/include directory
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
vcpkg_fixup_pkgconfig()
file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

14
ports/ois/vcpkg.json
View File

@ -1,7 +1,13 @@
{
"name": "ois",
"version-string": "1.5",
"port-version": 3,
"description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatiable with many systems and operating systems.",
"homepage": "https://wgois.github.io/OIS/"
"version": "1.5.1",
"description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatible with many systems and operating systems.",
"homepage": "https://wgois.github.io/OIS/",
"supports": "!(arm | arm64 | uwp)",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
]
}

3
scripts/ci.baseline.txt
View File

@ -1029,9 +1029,6 @@ ogre-next:x64-windows = skip
ogre-next:x64-windows-static = skip
ogre-next:x64-windows-static-md=skip
ogre-next:x86-windows = skip
ois:arm64-windows=fail
ois:arm-uwp=fail
ois:x64-uwp=fail
# ompl is vulnerable to some form of race in its dependent ports, and adding 'ode' as a dependency
# does not resolve the issue
# src/ompl/CMakeFiles/ompl.dir/extensions/ode/src/OpenDEStateValidityChecker.cpp.o

4
versions/baseline.json
View File

@ -4805,8 +4805,8 @@
"port-version": 2
},
"ois": {
"baseline": "1.5",
"port-version": 3
"baseline": "1.5.1",
"port-version": 0
},
"ompl": {
"baseline": "1.5.1",

5
versions/o-/ois.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "05dc4bcc0372eaa7b8a86f89a268c5ef0c69c5bf",
"version": "1.5.1",
"port-version": 0
},
{
"git-tree": "0d8ca34b4a48f37cf731b920ab96995bcc81a8f4",
"version-string": "1.5",