Skip to content

[dlib] Fix dependencies #50984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 1 commit into from
Apr 6, 2026
Merged

[dlib] Fix dependencies #50984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions ports/dlib/find_blas.patch
View file
Open in desktop

This file was deleted.

103 changes: 81 additions & 22 deletions ports/dlib/fix-dependencies.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,46 @@
diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt
index cfe6ad9..75cfd54 100644
index 0c7f43b..2c69a29 100644
--- a/dlib/CMakeLists.txt
+++ b/dlib/CMakeLists.txt
@@ -293,6 +293,7 @@ if (NOT TARGET dlib)
set(dlib_needed_public_ldflags)
set(dlib_needed_private_libraries)
set(dlib_needed_private_includes)
+ set(pkg_config_dlib_requires_private "")

if (DLIB_ISO_CPP_ONLY)
add_library(dlib ${source_files} )
@@ -833,6 +834,10 @@ if (NOT TARGET dlib)
@@ -603,6 +603,7 @@ if (NOT TARGET dlib)
if (DLIB_USE_BLAS)
if (blas_found)
list (APPEND dlib_needed_public_libraries ${blas_libraries})
+ string(APPEND pkg_config_dlib_requires_private " blas")
else()
set(DLIB_USE_BLAS OFF CACHE STRING ${DLIB_USE_BLAS_STR} FORCE )
toggle_preprocessor_switch(DLIB_USE_BLAS)
@@ -612,6 +613,7 @@ if (NOT TARGET dlib)
if (DLIB_USE_LAPACK)
if (lapack_found)
list (APPEND dlib_needed_public_libraries ${lapack_libraries})
+ string(APPEND pkg_config_dlib_requires_private " lapack")
if (lapack_with_underscore)
set(LAPACK_FORCE_UNDERSCORE 1)
enable_preprocessor_switch(LAPACK_FORCE_UNDERSCORE)
@@ -719,6 +721,10 @@ if (NOT TARGET dlib)


if (DLIB_LINK_WITH_SQLITE3)
+ find_package(unofficial-sqlite3 CONFIG REQUIRED)
+ list(APPEND dlib_needed_libraries unofficial::sqlite3::sqlite3)
+ list(APPEND dlib_needed_public_libraries unofficial::sqlite3::sqlite3)
+ string(APPEND pkg_config_dlib_requires_private " sqlite3")
+ elseif(0)
find_library(sqlite sqlite3)
# make sure sqlite3.h is in the include path
find_path(sqlite_path sqlite3.h)
@@ -848,6 +853,10 @@ if (NOT TARGET dlib)
@@ -734,6 +740,10 @@ if (NOT TARGET dlib)


if (DLIB_USE_FFTW)
+ find_package(FFTW3 CONFIG REQUIRED)
+ list(APPEND dlib_needed_libraries FFTW3::fftw3)
+ list(APPEND dlib_needed_public_libraries FFTW3::fftw3)
+ string(APPEND pkg_config_dlib_requires_private " fftw3")
+ elseif(0)
find_library(fftw fftw3)
# make sure fftw3.h is in the include path
find_path(fftw_path fftw3.h)
@@ -998,6 +1007,8 @@ if (NOT TARGET dlib)
@@ -877,6 +887,8 @@ if (NOT TARGET dlib)

## dlib-1.pc generation and installation

Expand All @@ -41,7 +49,7 @@ index cfe6ad9..75cfd54 100644
configure_file("cmake_utils/dlib.pc.in" "dlib-1.pc" @ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dlib-1.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
@@ -1011,7 +1022,7 @@ if (NOT TARGET dlib)
@@ -890,7 +902,7 @@ if (NOT TARGET dlib)

endif()

Expand All @@ -51,7 +59,7 @@ index cfe6ad9..75cfd54 100644
# visual studio mode that compiled them. We do this so that people who
# compile dlib and then copy the .lib files around (which they shouldn't be
diff --git a/dlib/cmake_utils/dlib.pc.in b/dlib/cmake_utils/dlib.pc.in
index 9060110..2ec27e8 100644
index 9060110..8820f33 100644
--- a/dlib/cmake_utils/dlib.pc.in
+++ b/dlib/cmake_utils/dlib.pc.in
@@ -6,3 +6,4 @@ Description: Numerical and networking C++ library
Expand All @@ -60,21 +68,72 @@ index 9060110..2ec27e8 100644
Cflags: -I${includedir} @pkg_config_dlib_needed_includes@
+Requires.private: @pkg_config_dlib_requires_private@
diff --git a/dlib/cmake_utils/dlibConfig.cmake.in b/dlib/cmake_utils/dlibConfig.cmake.in
index 2667a2e..cc7b4a2 100644
index 4f7ea1e..24755ce 100644
--- a/dlib/cmake_utils/dlibConfig.cmake.in
+++ b/dlib/cmake_utils/dlibConfig.cmake.in
@@ -31,6 +31,14 @@ if(NOT TARGET dlib-shared AND NOT dlib_BINARY_DIR)
unset(dlib_deps_threads_check)
endif()
@@ -12,6 +12,18 @@
Comment on lines -66 to +74
Copy link
Copy Markdown
Contributor Author

@dg0yt dg0yt Apr 6, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Key change: Call find_dependency() early.

# ===================================================================================


+include(CMakeFindDependencyMacro)
+find_dependency(BLAS)
+find_dependency(LAPACK)
+if("@DLIB_USE_FFTW@")
+ find_dependency(FFTW3 CONFIG)
+endif()
+if("@DLIB_LINK_WITH_SQLITE3@")
+ find_dependency(unofficial-sqlite3 CONFIG)
+endif()
+
set(dlib_LIBRARIES dlib::dlib)
+if("@DLIB_USE_CUDA@")
+ find_dependency(CUDAToolkit)
+endif()


# Our library dependencies (contains definitions for IMPORTED targets)
@@ -35,10 +47,6 @@ set(dlib_LIBRARIES dlib::dlib)
set(dlib_LIBS dlib::dlib)
set(dlib_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@" "@dlib_needed_includes@")

-if (@DLIB_USE_CUDA@)
- find_package(CUDAToolkit)
-endif()
-
mark_as_advanced(dlib_LIBRARIES)
mark_as_advanced(dlib_LIBS)
mark_as_advanced(dlib_INCLUDE_DIRS)
diff --git a/dlib/cmake_utils/find_blas.cmake b/dlib/cmake_utils/find_blas.cmake
index bdd98cd..0040b0f 100644
--- a/dlib/cmake_utils/find_blas.cmake
+++ b/dlib/cmake_utils/find_blas.cmake
@@ -32,7 +32,7 @@ SET(lapack_without_underscore 0)
message(STATUS "Searching for BLAS and LAPACK")
INCLUDE(CheckFunctionExists)

-if (UNIX OR MINGW)
+if (0)
message(STATUS "Searching for BLAS and LAPACK")

if (BUILDING_MATLAB_MEX_FILE)
@@ -296,7 +296,7 @@ if (UNIX OR MINGW)



-elseif(WIN32 AND NOT MINGW)
+elseif(0)
message(STATUS "Searching for BLAS and LAPACK")

include(CheckTypeSize)
@@ -435,11 +435,13 @@ endif()
if (NOT blas_found)
find_package(BLAS QUIET)
if (${BLAS_FOUND})
+ set(BLAS_LIBRARIES BLAS::BLAS)
set(blas_libraries ${BLAS_LIBRARIES})
set(blas_found 1)
if (NOT lapack_found)
find_package(LAPACK QUIET)
if (${LAPACK_FOUND})
+ set(LAPACK_LIBRARIES LAPACK::LAPACK)
set(lapack_libraries ${LAPACK_LIBRARIES})
set(lapack_found 1)
endif()
98 changes: 0 additions & 98 deletions ports/dlib/fix-lapack.patch
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ports/dlib/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-dependencies.patch
find_blas.patch
fix-lapack.patch
)

file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external")
Expand Down
1 change: 1 addition & 0 deletions ports/dlib/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "dlib",
"version": "20.0.1",
"port-version": 1,
"description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++",
"homepage": "https://github.com/davisking/dlib",
"license": "BSL-1.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2550,7 +2550,7 @@
},
"dlib": {
"baseline": "20.0.1",
"port-version": 0
"port-version": 1
},
"dlpack": {
"baseline": "1.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/d-/dlib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c1a270ddbab3a834e181e2216c293138848d4622",
"version": "20.0.1",
"port-version": 1
},
{
"git-tree": "0eceb3fc9659854e88aa0a6cb2915c62c0fe1bf1",
"version": "20.0.1",
Expand Down