diff options
| author | ras0219 <robertallenschumacher@gmail.com> | 2020-06-09 11:39:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 11:39:17 -0700 |
| commit | 09abe700ac72d8d163181d6eb7797895834d5ca8 (patch) | |
| tree | ab86075bf0d40b2bda22f2c62c331f63287b98f8 | |
| parent | 1d3e985e4f1b0d52adf1a8eba7a4c0a092938cfb (diff) | |
| download | vcpkg-09abe700ac72d8d163181d6eb7797895834d5ca8.tar.gz vcpkg-09abe700ac72d8d163181d6eb7797895834d5ca8.zip | |
[mlpack] Explicitly depend on stb (#11785)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
| -rw-r--r-- | ports/mlpack/CONTROL | 4 | ||||
| -rw-r--r-- | ports/mlpack/portfile.cmake | 4 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ports/mlpack/CONTROL b/ports/mlpack/CONTROL index dc4f41b62..dfccb9025 100644 --- a/ports/mlpack/CONTROL +++ b/ports/mlpack/CONTROL @@ -1,8 +1,8 @@ Source: mlpack -Version: 3.2.2-2 +Version: 3.2.2-3 Homepage: https://github.com/mlpack/mlpack Description: mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms. -Build-Depends: openblas (!osx), clapack (!osx), boost, armadillo, ensmallen +Build-Depends: openblas (!osx), clapack (!osx), boost, armadillo, ensmallen, stb Feature: tools Description: Build command-line executables. diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake index 53f5967c3..a7d73b2e3 100644 --- a/ports/mlpack/portfile.cmake +++ b/ports/mlpack/portfile.cmake @@ -28,6 +28,10 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_TESTS=OFF + -DDOWNLOAD_STB_IMAGE=OFF + -DDOWNLOAD_ENSMALLEN=OFF + -DBUILD_PYTHON_BINDINGS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON ${FEATURE_OPTIONS} ) vcpkg_install_cmake() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index df31d1489..6fcd0648c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1092,10 +1092,6 @@ microsoft-signalr:x64-uwp=skip microsoft-signalr:x64-windows=skip
microsoft-signalr:x64-windows-static=skip
microsoft-signalr:x86-windows=skip
-# conflicts with stb
-mlpack:x86-windows=skip
-mlpack:x64-windows=skip
-mlpack:x64-windows-static=skip
mman:x64-linux=fail
mman:x64-osx=fail
mmloader:arm64-windows=fail
|