From cc99ad6ee41630007cd253b3d9e7f4d1cdaa160b Mon Sep 17 00:00:00 2001
From: Sean Warren <s.warren@garvan.org.au>
Date: Wed, 3 Jan 2018 07:58:20 +1100
Subject: Use vcpkg version of BLAS and LAPACK in dlib dlib v19.8 detects these
 packages correctly

---
 ports/dlib/CONTROL        | 5 +----
 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
-- 
cgit v1.2.3