diff options
| author | Erwan BERNARD <edmBernard@users.noreply.github.com> | 2020-05-08 08:33:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 23:33:16 -0700 |
| commit | c985d753ce9a747461c884e357e4b9095fad5753 (patch) | |
| tree | ca804c5dcb37b9cb18c4a0dbeaa148da0703e0f8 | |
| parent | 147f02caffdf854cb53e2a023c894615a224f356 (diff) | |
| download | vcpkg-c985d753ce9a747461c884e357e4b9095fad5753.tar.gz vcpkg-c985d753ce9a747461c884e357e4b9095fad5753.zip | |
[dlib] add more granularity in features (#11195)
* [dlib] add more feature selection
* [dlib] replace custom with check_features
* [dlib] bump version in CONTROL
| -rw-r--r-- | ports/dlib/CONTROL | 13 | ||||
| -rw-r--r-- | ports/dlib/portfile.cmake | 13 |
2 files changed, 17 insertions, 9 deletions
diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL index bd82421fc..9828f9726 100644 --- a/ports/dlib/CONTROL +++ b/ports/dlib/CONTROL @@ -1,9 +1,18 @@ Source: dlib -Version: 19.19 -Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas (!osx), clapack (!osx) +Version: 19.19-1 +Build-Depends: libjpeg-turbo, libpng, openblas (!osx), clapack (!osx) 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 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 0872387ce..13d0ee175 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -21,22 +21,21 @@ file(READ "${SOURCE_PATH}/dlib/CMakeLists.txt" DLIB_CMAKE) string(REPLACE "PNG_LIBRARY" "PNG_LIBRARIES" DLIB_CMAKE "${DLIB_CMAKE}") file(WRITE "${SOURCE_PATH}/dlib/CMakeLists.txt" "${DLIB_CMAKE}") -set(WITH_CUDA OFF) -if("cuda" IN_LIST FEATURES) - set(WITH_CUDA ON) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + "sqlite3" DLIB_LINK_WITH_SQLITE3 + "fftw3" DLIB_USE_FFTW + "cuda" DLIB_USE_CUDA +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DDLIB_LINK_WITH_SQLITE3=ON - -DDLIB_USE_FFTW=ON + ${FEATURE_OPTIONS} -DDLIB_PNG_SUPPORT=ON -DDLIB_JPEG_SUPPORT=ON -DDLIB_USE_BLAS=ON -DDLIB_USE_LAPACK=ON - -DDLIB_USE_CUDA=${WITH_CUDA} -DDLIB_GIF_SUPPORT=OFF -DDLIB_USE_MKL_FFT=OFF -DCMAKE_DEBUG_POSTFIX=d |