3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 12:57:59 +08:00
Code Issues Projects Releases Wiki Activity

[dlib] fix mac, windows-static build (#5477)

Browse Source
This commit is contained in:
Sean Warren 2019-02-28 18:52:31 +11:00 committed by Phil Christensen
parent 3881ade159
commit ddf0043e94
4 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/dlib/CONTROL
View File

@ -1,5 +1,5 @@
Source: dlib
Version: 19.16
Version: 19.16-1
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++

12
ports/dlib/fix-mac-jpeg.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt
--- a/dlib/CMakeLists.txt
+++ b/dlib/CMakeLists.txt
@@ -480,7 +480,7 @@
set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY})
CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD)
endif()
- if (JPEG_FOUND AND LIBJPEG_IS_GOOD AND NOT APPLE)
+ if (JPEG_FOUND AND LIBJPEG_IS_GOOD)
include_directories(${JPEG_INCLUDE_DIR})
set (dlib_needed_libraries ${dlib_needed_libraries} ${JPEG_LIBRARY})
else()

57
ports/dlib/fix-sqlite3-fftw-linkage.patch Normal file
View File

@ -0,0 +1,57 @@
diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt
--- a/dlib/CMakeLists.txt
+++ b/dlib/CMakeLists.txt
@@ -747,32 +750,15 @@
if (DLIB_LINK_WITH_SQLITE3)
- find_library(sqlite sqlite3)
- # make sure sqlite3.h is in the include path
- find_path(sqlite_path sqlite3.h)
- if (sqlite AND sqlite_path)
- set(dlib_needed_includes ${dlib_needed_includes} ${sqlite_path})
- set(dlib_needed_libraries ${dlib_needed_libraries} ${sqlite} )
- else()
- 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 )
endif()
if (DLIB_USE_FFTW)
- find_library(fftw fftw3)
- # make sure fftw3.h is in the include path
- find_path(fftw_path fftw3.h)
- if (fftw AND fftw_path)
- set(dlib_needed_includes ${dlib_needed_includes} ${fftw_path})
- set(dlib_needed_libraries ${dlib_needed_libraries} ${fftw} )
- else()
- set(DLIB_USE_FFTW OFF CACHE STRING ${DLIB_USE_FFTW_STR} FORCE )
- toggle_preprocessor_switch(DLIB_USE_FFTW)
- endif()
- mark_as_advanced(fftw fftw_path)
+ find_package(FFTW3 CONFIG)
+ set(dlib_needed_libraries ${dlib_needed_libraries} FFTW3::fftw3)
endif()
--- a/dlib/cmake_utils/dlibConfig.cmake.in
+++ b/dlib/cmake_utils/dlibConfig.cmake.in
@@ -28,6 +28,14 @@
include("${dlib_CMAKE_DIR}/dlib.cmake")
endif()
+include(CMakeFindDependencyMacro)
+if("@DLIB_USE_FFTW@")
+ find_dependency(FFTW3 CONFIG)
+endif()
+if("@DLIB_LINK_WITH_SQLITE3@")
+ find_dependency(sqlite3 CONFIG)
+endif()
+
set(dlib_LIBRARIES dlib::dlib)
set(dlib_LIBS dlib::dlib)
set(dlib_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@" "@dlib_needed_includes@")

4
ports/dlib/portfile.cmake
View File

@ -11,6 +11,9 @@ vcpkg_from_github(
REF v19.16
SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887
HEAD_REF master
PATCHES
fix-mac-jpeg.patch
fix-sqlite3-fftw-linkage.patch
)
file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/libjpeg)
@ -40,6 +43,7 @@ vcpkg_configure_cmake(
-DDLIB_USE_CUDA=${WITH_CUDA}
-DDLIB_GIF_SUPPORT=OFF
-DDLIB_USE_MKL_FFT=OFF
-DCMAKE_DEBUG_POSTFIX=d
OPTIONS_DEBUG
-DDLIB_ENABLE_ASSERTS=ON
#-DDLIB_ENABLE_STACK_TRACE=ON