diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-16 15:11:34 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-03-16 15:11:34 -0700 |
| commit | 8a3b55f2d70aa1ffd6f79044f282a478352d11ff (patch) | |
| tree | 0d1e2d30dbb161762f3db71ec8ba6d1aba931403 | |
| parent | e812f4bfccb45079c6c4d979c0c4458af3a9c635 (diff) | |
| download | vcpkg-8a3b55f2d70aa1ffd6f79044f282a478352d11ff.tar.gz vcpkg-8a3b55f2d70aa1ffd6f79044f282a478352d11ff.zip | |
[dlib] Add dependencies on system copies of jpeg, sqlite, png, and fftw
| -rw-r--r-- | ports/dlib/CONTROL | 3 | ||||
| -rw-r--r-- | ports/dlib/portfile.cmake | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL index b5140eb1d..edb4b4e85 100644 --- a/ports/dlib/CONTROL +++ b/ports/dlib/CONTROL @@ -1,3 +1,4 @@ Source: dlib -Version: 19.4 +Version: 19.4-1 +Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3 Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index 0a5f78a9b..4763c5613 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -13,13 +13,20 @@ vcpkg_download_distfile(ARCHIVE SHA512 c5ae22c507b57a13d880d79e9671730829114d0276508b0a41b373d3abae9057d960fce84fafe1be468d943910853baaa70c88f2516e20a0c41f3895bf217f7b ) vcpkg_extract_source_archive(${ARCHIVE}) +file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/libjpeg) +file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/libpng) +file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/zlib) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - - OPTIONS_DEBUG - -DDLIB_ENALE_ASSERTS=ON + OPTIONS + -DDLIB_LINK_WITH_SQLITE3=ON + -DDLIB_USE_FFTW=ON + #-DDLIB_USE_CUDA=ON + OPTIONS_DEBUG + -DDLIB_ENABLE_ASSERTS=ON + #-DDLIB_ENABLE_STACK_TRACE=ON ) vcpkg_install_cmake() |