diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2018-01-17 19:00:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2018-01-17 19:00:43 +1100 |
| commit | c30363d07b3f64b5f38531442ea92d9c1cf81d13 (patch) | |
| tree | 8a169a2a0aadf40dad50e73d226c3eca1e949327 /ports/dlib | |
| parent | 47189e90d59459be69d4f6a0b039849913031c8e (diff) | |
| parent | 28c5c6ae4601c323cbd57a13da03b9047dc282ad (diff) | |
| download | vcpkg-c30363d07b3f64b5f38531442ea92d9c1cf81d13.tar.gz vcpkg-c30363d07b3f64b5f38531442ea92d9c1cf81d13.zip | |
Merge branch 'master' into qt5_modular
Diffstat (limited to 'ports/dlib')
| -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 |