diff options
| author | nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> | 2021-07-20 12:24:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 10:24:58 -0700 |
| commit | 0e1dc121856eef84bf1852134e548bf9898dabac (patch) | |
| tree | 4bbae150d61121c81c33a2f4b7b92063e4db3060 /ports/dlib | |
| parent | b67fab9861239e33b722b9a44f5c96dec6ca807e (diff) | |
| download | vcpkg-0e1dc121856eef84bf1852134e548bf9898dabac.tar.gz vcpkg-0e1dc121856eef84bf1852134e548bf9898dabac.zip | |
[rollup] Rollup PR 2021-07-16 (#19001)
* [rollup:2021-07-16 1/7] PR #18201 (@JackBoosY)
[vcpkg-cmake] Add check for unused cmake variables
* [rollup:2021-07-16 2/7] PR #18397 (@strega-nil)
[vcpkg_list] add new function
* [rollup:2021-07-16 3/7] PR #18782 (@strega-nil)
[scripts-audit] vcpkg_build_ninja
* [rollup:2021-07-16 4/7] PR #18784 (@strega-nil)
[scripts-audit] vcpkg_minimum_required
* [rollup:2021-07-16 5/7] PR #18785 (@strega-nil)
[scripts-audit] vcpkg_replace_string
* [rollup:2021-07-16 6/7] PR #18786 (@strega-nil)
[scripts-audit] windows scripts
* [rollup:2021-07-16 7/7] PR #18945 (@strega-nil)
[many ports] remove deprecated vcpkg_check_features call [1/5]
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'ports/dlib')
| -rw-r--r-- | ports/dlib/CONTROL | 19 | ||||
| -rw-r--r-- | ports/dlib/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/dlib/vcpkg.json | 38 |
3 files changed, 42 insertions, 22 deletions
diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL deleted file mode 100644 index c9b8f1f68..000000000 --- a/ports/dlib/CONTROL +++ /dev/null @@ -1,19 +0,0 @@ -Source: dlib -Version: 19.21 -Port-Version: 4 -Build-Depends: libjpeg-turbo, libpng, blas, lapack -Homepage: https://github.com/davisking/dlib -Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ -Default-Features: fftw3, sqlite3 - -Feature: cuda -Build-Depends: cuda, cudnn -Description: CUDA support for dlib - -Feature: fftw3 -Build-Depends: fftw3 -Description: fftw3 support for dlib - -Feature: sqlite3 -Build-Depends: sqlite3 -Description: sqlite3 support for dlib diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index 00f45d25f..481554b90 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -22,9 +22,10 @@ string(REPLACE "PNG_LIBRARY" "PNG_LIBRARIES" DLIB_CMAKE "${DLIB_CMAKE}") file(WRITE "${SOURCE_PATH}/dlib/CMakeLists.txt" "${DLIB_CMAKE}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "sqlite3" DLIB_LINK_WITH_SQLITE3 - "fftw3" DLIB_USE_FFTW - "cuda" DLIB_USE_CUDA + FEATURES + "sqlite3" DLIB_LINK_WITH_SQLITE3 + "fftw3" DLIB_USE_FFTW + "cuda" DLIB_USE_CUDA ) vcpkg_configure_cmake( diff --git a/ports/dlib/vcpkg.json b/ports/dlib/vcpkg.json new file mode 100644 index 000000000..bb60944f8 --- /dev/null +++ b/ports/dlib/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "dlib", + "version": "19.21", + "port-version": 5, + "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++", + "homepage": "https://github.com/davisking/dlib", + "dependencies": [ + "blas", + "lapack", + "libjpeg-turbo", + "libpng" + ], + "default-features": [ + "fftw3", + "sqlite3" + ], + "features": { + "cuda": { + "description": "CUDA support for dlib", + "dependencies": [ + "cuda", + "cudnn" + ] + }, + "fftw3": { + "description": "fftw3 support for dlib", + "dependencies": [ + "fftw3" + ] + }, + "sqlite3": { + "description": "sqlite3 support for dlib", + "dependencies": [ + "sqlite3" + ] + } + } +} |