Skip to content

[dlib] fix lapack link error #23164

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

Closed
Adela0814 wants to merge 1 commit into from
Closed

[dlib] fix lapack link error #23164

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
53 changes: 53 additions & 0 deletions ports/dlib/fix-lapack-linkage.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt
index 2762649..1b3d56a 100644
--- a/dlib/CMakeLists.txt
+++ b/dlib/CMakeLists.txt
@@ -568,15 +568,6 @@ if (NOT TARGET dlib)
# Try to find BLAS, LAPACK and MKL
include(cmake_utils/find_blas.cmake)

- if (DLIB_USE_BLAS)
- if (blas_found)
- set (dlib_needed_libraries ${dlib_needed_libraries} ${blas_libraries})
- else()
- set(DLIB_USE_BLAS OFF CACHE STRING ${DLIB_USE_BLAS_STR} FORCE )
- toggle_preprocessor_switch(DLIB_USE_BLAS)
- endif()
- endif()
-
if (DLIB_USE_LAPACK)
if (lapack_found)
set (dlib_needed_libraries ${dlib_needed_libraries} ${lapack_libraries})
@@ -593,6 +584,15 @@ if (NOT TARGET dlib)
endif()
endif()

+ if (DLIB_USE_BLAS)
+ if (blas_found)
+ set (dlib_needed_libraries ${dlib_needed_libraries} ${blas_libraries})
+ else()
+ set(DLIB_USE_BLAS OFF CACHE STRING ${DLIB_USE_BLAS_STR} FORCE )
+ toggle_preprocessor_switch(DLIB_USE_BLAS)
+ endif()
+ endif()
+
if (DLIB_USE_MKL_FFT)
if (found_intel_mkl AND found_intel_mkl_headers)
set (dlib_needed_includes ${dlib_needed_includes} ${mkl_include_dir})
diff --git a/dlib/cmake_utils/dlibConfig.cmake.in b/dlib/cmake_utils/dlibConfig.cmake.in
index 53f7afb..931b19c 100644
--- a/dlib/cmake_utils/dlibConfig.cmake.in
+++ b/dlib/cmake_utils/dlibConfig.cmake.in
@@ -29,10 +29,10 @@ if(NOT TARGET dlib-shared AND NOT dlib_BINARY_DIR)
endif()

include(CMakeFindDependencyMacro)
-if("@DLIB_USE_FFTW@")
+if(@DLIB_USE_FFTW@)
find_dependency(FFTW3 CONFIG)
endif()
-if("@DLIB_LINK_WITH_SQLITE3@")
+if(@DLIB_LINK_WITH_SQLITE3@)
find_dependency(unofficial-sqlite3 CONFIG)
endif()

1 change: 1 addition & 0 deletions ports/dlib/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vcpkg_from_github(
fix-sqlite3-fftw-linkage.patch
force_finding_packages.patch
find_blas.patch
fix-lapack-linkage.patch
)

file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/libjpeg")
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": "19.23",
"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 @@ -1882,7 +1882,7 @@
},
"dlib": {
"baseline": "19.23",
"port-version": 0
"port-version": 1
},
"dmlc": {
"baseline": "2019-08-12",
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": "2f1b46318e2afb717e2b419dabbf7446d64bb0be",
"version": "19.23",
"port-version": 1
},
{
"git-tree": "825d6117ba43320dd5969535320b8be3144ea9de",
"version": "19.23",
Expand Down