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

microsoft · Dec 10, 2020 · d5e6bd5 · d5e6bd5
1 parent 9be0e17
commit d5e6bd5
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/ports/anyrpc/CONTROL b/ports/anyrpc/CONTROL
diff --git a/ports/anyrpc/portfile.cmake b/ports/anyrpc/portfile.cmake
@@ -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

diff --git a/ports/anyrpc/vcpkg.json b/ports/anyrpc/vcpkg.json
@@ -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"
+}
diff --git a/ports/ois/CONTROL b/ports/ois/CONTROL
diff --git a/ports/ois/portfile.cmake b/ports/ois/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_from_github(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
 )
 
 vcpkg_install_cmake()

diff --git a/ports/ois/vcpkg.json b/ports/ois/vcpkg.json
@@ -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/"
+}
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -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
@@ -1461,7 +1463,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