6 files changed, 63 insertions, 46 deletions
diff --git a/ports/ceres/CONTROL b/ports/ceres/CONTROL
deleted file mode 100644
index 2ad6f31be..000000000
--- a/ports/ceres/CONTROL
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: ceres
-Version: 2.0.0
-Build-Depends: glog, eigen3
-Homepage: https://github.com/ceres-solver/ceres-solver
-Description: non-linear optimization package
-
-Feature: lapack
-Build-Depends: lapack
-Description: Use Lapack in Ceres
-
-Feature: suitesparse
-Build-Depends: ceres[lapack], suitesparse[core]
-Description: SuiteSparse support for Ceres
-
-Feature: cxsparse
-Build-Depends: suitesparse[core]
-Description: CXSparse support for Ceres
-
-Feature: eigensparse
-Description: Use of Eigen as a sparse linear algebra library in Ceres
-
-Feature: tools
-Build-Depends: gflags
-Description: Ceres tools
diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake
index c1dca74a9..d106217e6 100644
--- a/ports/ceres/portfile.cmake
+++ b/ports/ceres/portfile.cmake
@@ -38,6 +38,7 @@ vcpkg_configure_cmake(
     OPTIONS
         ${FEATURE_OPTIONS}
         -DEXPORT_BUILD_DIR=ON
+        -DBUILD_BENCHMARKS=OFF
         -DBUILD_EXAMPLES=OFF
         -DBUILD_TESTING=OFF
         -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT_VALUE}
diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json
new file mode 100644
index 000000000..7a7177833
--- /dev/null
+++ b/ports/ceres/vcpkg.json
@@ -0,0 +1,52 @@
+{
+  "name": "ceres",
+  "version-string": "2.0.0",
+  "port-version": 1,
+  "description": "non-linear optimization package",
+  "homepage": "https://github.com/ceres-solver/ceres-solver",
+  "dependencies": [
+    "eigen3",
+    "glog"
+  ],
+  "features": {
+    "cxsparse": {
+      "description": "CXSparse support for Ceres",
+      "dependencies": [
+        {
+          "name": "suitesparse",
+          "default-features": false
+        }
+      ]
+    },
+    "eigensparse": {
+      "description": "Use of Eigen as a sparse linear algebra library in Ceres"
+    },
+    "lapack": {
+      "description": "Use Lapack in Ceres",
+      "dependencies": [
+        "lapack"
+      ]
+    },
+    "suitesparse": {
+      "description": "SuiteSparse support for Ceres",
+      "dependencies": [
+        {
+          "name": "ceres",
+          "features": [
+            "lapack"
+          ]
+        },
+        {
+          "name": "suitesparse",
+          "default-features": false
+        }
+      ]
+    },
+    "tools": {
+      "description": "Ceres tools",
+      "dependencies": [
+        "gflags"
+      ]
+    }
+  }
+}
diff --git a/ports/wepoll/CONTROL b/ports/wepoll/CONTROL
deleted file mode 100644
index f4882434a..000000000
--- a/ports/wepoll/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: wepoll
-Version: 1.5.8
-Description: Fast epoll for windows
-Homepage: https://github.com/piscisaureus/wepoll
diff --git a/ports/wepoll/vcpkg.json b/ports/wepoll/vcpkg.json
new file mode 100644
index 000000000..c2d14c637
--- /dev/null
+++ b/ports/wepoll/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "wepoll",
+  "version-string": "1.5.8",
+  "port-version": 1,
+  "description": "Fast epoll for windows",
+  "homepage": "https://github.com/piscisaureus/wepoll",
+  "supports": "windows"
+}
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index d775cadbf..79728d862 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -456,7 +456,6 @@ ignition-common1:x64-linux=fail
 ignition-msgs1:arm64-windows=fail
 ignition-msgs1:arm-uwp=fail
 ignition-msgs1:x64-uwp=fail
-ignition-msgs5:x64-linux=fail
 ignition-msgs5:arm64-windows=fail
 ignition-msgs5:arm-uwp=fail
 ignition-msgs5:x64-uwp=fail
@@ -688,11 +687,8 @@ libqcow:x64-windows=skip
 libqcow:x64-linux=skip
 libqcow:x86-windows=skip
 libqcow:arm64-windows=skip
-
-libraqm:x64-windows-static=fail
 librdkafka:arm-uwp=fail
 librdkafka:x64-uwp=fail
-
 # Conflicts with openssl
 boringssl:arm64-windows      = skip
 boringssl:arm-uwp            = skip
@@ -993,9 +989,10 @@ numactl:x86-windows=fail
 nvtt:arm64-windows=fail
 nvtt:arm-uwp=fail
 nvtt:x64-uwp=fail
-ocilib:arm64-windows=fail
 ocilib:arm-uwp=fail
+ocilib:arm64-windows=fail
 ocilib:x64-uwp=fail
+ocilib:x64-windows-static=fail
 octomap:arm-uwp=fail
 octomap:x64-uwp=fail
 ode:arm64-windows=fail
@@ -1101,10 +1098,6 @@ openssl-uwp:x64-osx=fail
 openssl-uwp:x64-windows=fail
 openssl-uwp:x64-windows-static=fail
 openssl-uwp:x86-windows=fail
-openssl-windows:arm-uwp=fail
-openssl-windows:x64-linux=fail
-openssl-windows:x64-osx=fail
-openssl-windows:x64-uwp=fail
 opentracing:arm-uwp=fail
 opentracing:x64-uwp=fail
 openvpn3:x64-osx=fail
@@ -1454,17 +1447,12 @@ spdk-isal:x64-windows=fail
 spdk-isal:x64-windows-static=fail
 spdk-isal:x86-windows=fail
 speexdsp:x64-linux=fail
-speexdsp:x64-osx=fail
 spirv-tools:arm-uwp=fail
 spirv-tools:x64-uwp=fail
 stormlib:arm-uwp=fail
 stormlib:x64-uwp=fail
 stxxl:arm-uwp=fail
 stxxl:x64-uwp=fail
-# Sundials was broken by Ninja 1.9.0 https://github.com/ninja-build/ninja/pull/1406
-sundials:arm64-windows=fail
-sundials:x64-windows=fail
-sundials:x86-windows=fail
 systemc:arm64-windows=fail
 systemc:arm-uwp=fail
 systemc:x64-uwp=fail
@@ -1587,10 +1575,6 @@ vxl:x64-windows        = skip
 vxl:x64-windows-static = skip
 vxl:x86-windows        = skip
 wampcc:arm64-windows=fail
-wepoll:arm-uwp=fail
-wepoll:x64-uwp=fail
-wepoll:x64-linux=fail
-wepoll:x64-osx=fail
 wildmidi:x64-osx=fail
 wincrypt:x64-linux=fail
 wincrypt:x64-osx=fail