From 2ea680ff0d20aed86f755045ed8ea5d2f8d2b859 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Thu, 3 Sep 2020 21:57:11 -0700 Subject: [dlib] Fix dependency port sqlite3 (#13325) --- ports/dlib/CONTROL | 2 +- ports/dlib/fix-sqlite3-fftw-linkage.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL index 042b2b791..f651f9d62 100644 --- a/ports/dlib/CONTROL +++ b/ports/dlib/CONTROL @@ -1,6 +1,6 @@ Source: dlib Version: 19.21 -Port-Version: 3 +Port-Version: 4 Build-Depends: libjpeg-turbo, libpng, openblas, lapack Homepage: https://github.com/davisking/dlib Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ diff --git a/ports/dlib/fix-sqlite3-fftw-linkage.patch b/ports/dlib/fix-sqlite3-fftw-linkage.patch index 84ab0c265..41ba700b4 100644 --- a/ports/dlib/fix-sqlite3-fftw-linkage.patch +++ b/ports/dlib/fix-sqlite3-fftw-linkage.patch @@ -15,8 +15,8 @@ diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt - set(DLIB_LINK_WITH_SQLITE3 OFF CACHE STRING ${DLIB_LINK_WITH_SQLITE3_STR} FORCE ) - endif() - mark_as_advanced(sqlite sqlite_path) -+ find_package(sqlite3 CONFIG) -+ set(dlib_needed_libraries ${dlib_needed_libraries} sqlite3 ) ++ find_package(unofficial-sqlite3 CONFIG) ++ set(dlib_needed_libraries ${dlib_needed_libraries} unofficial::sqlite3::sqlite3) endif() @@ -49,7 +49,7 @@ diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt + find_dependency(FFTW3 CONFIG) +endif() +if("@DLIB_LINK_WITH_SQLITE3@") -+ find_dependency(sqlite3 CONFIG) ++ find_dependency(unofficial-sqlite3 CONFIG) +endif() + set(dlib_LIBRARIES dlib::dlib) -- cgit v1.2.3