[dlib] add more granularity in features (#11195)

* [dlib] add more feature selection

* [dlib] replace custom with check_features

* [dlib] bump version in CONTROL
This commit is contained in:
Erwan BERNARD 2020-05-08 08:33:16 +02:00 committed by GitHub
parent 147f02caff
commit c985d753ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions

View File

@ -1,9 +1,18 @@
Source: dlib Source: dlib
Version: 19.19 Version: 19.19-1
Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas (!osx), clapack (!osx) Build-Depends: libjpeg-turbo, libpng, openblas (!osx), clapack (!osx)
Homepage: https://github.com/davisking/dlib Homepage: https://github.com/davisking/dlib
Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++
Default-Features: fftw3, sqlite3
Feature: cuda Feature: cuda
Build-Depends: cuda Build-Depends: cuda
Description: CUDA support for dlib 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

View File

@ -21,22 +21,21 @@ file(READ "${SOURCE_PATH}/dlib/CMakeLists.txt" DLIB_CMAKE)
string(REPLACE "PNG_LIBRARY" "PNG_LIBRARIES" DLIB_CMAKE "${DLIB_CMAKE}") string(REPLACE "PNG_LIBRARY" "PNG_LIBRARIES" DLIB_CMAKE "${DLIB_CMAKE}")
file(WRITE "${SOURCE_PATH}/dlib/CMakeLists.txt" "${DLIB_CMAKE}") file(WRITE "${SOURCE_PATH}/dlib/CMakeLists.txt" "${DLIB_CMAKE}")
set(WITH_CUDA OFF) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
if("cuda" IN_LIST FEATURES) "sqlite3" DLIB_LINK_WITH_SQLITE3
set(WITH_CUDA ON) "fftw3" DLIB_USE_FFTW
endif() "cuda" DLIB_USE_CUDA
)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA
OPTIONS OPTIONS
-DDLIB_LINK_WITH_SQLITE3=ON ${FEATURE_OPTIONS}
-DDLIB_USE_FFTW=ON
-DDLIB_PNG_SUPPORT=ON -DDLIB_PNG_SUPPORT=ON
-DDLIB_JPEG_SUPPORT=ON -DDLIB_JPEG_SUPPORT=ON
-DDLIB_USE_BLAS=ON -DDLIB_USE_BLAS=ON
-DDLIB_USE_LAPACK=ON -DDLIB_USE_LAPACK=ON
-DDLIB_USE_CUDA=${WITH_CUDA}
-DDLIB_GIF_SUPPORT=OFF -DDLIB_GIF_SUPPORT=OFF
-DDLIB_USE_MKL_FFT=OFF -DDLIB_USE_MKL_FFT=OFF
-DCMAKE_DEBUG_POSTFIX=d -DCMAKE_DEBUG_POSTFIX=d