Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tcl, anyrpc, ois, osgearth] Build Fixes 2020-12-09 #15030

Merged
merged 2 commits into from
Dec 10, 2020
Merged

[tcl, anyrpc, ois, osgearth] Build Fixes 2020-12-09 #15030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f86bed
Build Fixes 2020-12-09
BillyONeal Dec 9, 2020
f432144
Actually remove tcl:x64-osx
BillyONeal Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ports/anyrpc/CONTROL
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ports/anyrpc/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARE
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_EXAMPLES=OFF
-DBUILD_TESTS=OFF
Expand Down
7 changes: 7 additions & 0 deletions ports/anyrpc/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "anyrpc",
"version-string": "2020-01-13",
"port-version": 2,
"description": "A multiprotocol remote procedure call system for C++.",
"homepage": "https://github.com/sgieseking/anyrpc"
}
4 changes: 0 additions & 4 deletions ports/ois/CONTROL
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ports/ois/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
DISABLE_PARALLEL_CONFIGURE
)

vcpkg_install_cmake()
Expand Down
7 changes: 7 additions & 0 deletions ports/ois/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "ois",
"version-string": "1.5",
"port-version": 2,
"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/"
}
5 changes: 3 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,9 +1122,11 @@ opusfile:arm-uwp=fail
opusfile:x64-uwp=fail
orocos-kdl:arm-uwp=fail
orocos-kdl:x64-uwp=fail
osgearth:x64-osx=fail
osgearth:x64-linux=fail
osgearth:x64-osx=fail
osgearth:x64-windows-static=fail
osgearth:x64-windows=fail
osgearth:x86-windows=fail
paho-mqtt:arm-uwp=fail
paho-mqtt:x64-uwp=fail
pangomm:x64-osx=fail
Expand Down Expand Up @@ -1462,7 +1464,6 @@ tbb:x64-uwp=fail
tcl:arm-uwp=fail
tcl:arm64-windows=fail
tcl:x64-uwp=fail
tcl:x64-osx=fail
teemo:x64-uwp=fail
teemo:arm-uwp=fail
teemo:arm64-windows=fail
Expand Down