diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-01-02 23:22:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 23:22:58 +0200 |
| commit | 9dbe454385cb78ea98a205eefd2c578414e3cefd (patch) | |
| tree | ece41c5c1010afe4fab021def5e1c7bb41529b3b | |
| parent | 0b1fa2834e79eeaecedadb4594f2243e382ce0f8 (diff) | |
| parent | cc99ad6ee41630007cd253b3d9e7f4d1cdaa160b (diff) | |
| download | vcpkg-9dbe454385cb78ea98a205eefd2c578414e3cefd.tar.gz vcpkg-9dbe454385cb78ea98a205eefd2c578414e3cefd.zip | |
Merge pull request #2489 from seanwarren/dlib-use-clapack-openblas
[dlib] Use vcpkg version of BLAS and LAPACK
| -rw-r--r-- | ports/dlib/CONTROL | 5 | ||||
| -rw-r--r-- | ports/dlib/portfile.cmake | 9 |
2 files changed, 3 insertions, 11 deletions
diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL index 4d0a72f50..51f4d1e03 100644 --- a/ports/dlib/CONTROL +++ b/ports/dlib/CONTROL @@ -1,11 +1,8 @@ Source: dlib Version: 19.8 -Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3 +Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas, clapack Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ -Feature: blas -Description: BLAS support for dlib - Feature: cuda Build-Depends: cuda Description: CUDA support for dlib diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index 9d82cbf19..99784551a 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -17,11 +17,6 @@ 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_BLAS OFF) -if("blas" IN_LIST FEATURES) - set(WITH_BLAS ON) -endif() - set(WITH_CUDA OFF) if("cuda" IN_LIST FEATURES) set(WITH_CUDA ON) @@ -35,8 +30,8 @@ vcpkg_configure_cmake( -DDLIB_USE_FFTW=ON -DDLIB_PNG_SUPPORT=ON -DDLIB_JPEG_SUPPORT=ON - -DDLIB_USE_BLAS=${WITH_BLAS} - -DDLIB_USE_LAPACK=OFF + -DDLIB_USE_BLAS=ON + -DDLIB_USE_LAPACK=ON -DDLIB_USE_CUDA=${WITH_CUDA} -DDLIB_GIF_SUPPORT=OFF -DDLIB_USE_MKL_FFT=OFF |