mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
Merge pull request #2489 from seanwarren/dlib-use-clapack-openblas
[dlib] Use vcpkg version of BLAS and LAPACK
This commit is contained in:
commit
9dbe454385
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user