Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[dlib] Fix dependency port sqlite3 (#13325)

This commit is contained in:
Phoebe 2020-09-03 21:57:11 -07:00 committed by GitHub
parent 85247c3981
commit 2ea680ff0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/dlib/CONTROL
View File

@ -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++

6
ports/dlib/fix-sqlite3-fftw-linkage.patch
View File

@ -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)