NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made cmake check that libpng and libjpeg actually contain the link symbols they

Browse Source 
are supposed to since, on some systems, these libraries aren't installed
correctly and will cause linker errors if used.
This commit is contained in:
Davis King 2014-12-29 19:50:05 -05:00
parent fa60632d28
commit 01f030dda1
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlib/CMakeLists.txt
View File

@ -213,11 +213,16 @@ if (NOT TARGET dlib)
)
endif()
INCLUDE (CheckFunctionExists)
if (DLIB_LINK_WITH_LIBPNG)
# try to find libpng
find_package(PNG QUIET)
if (PNG_FOUND)
# Make sure there isn't something wrong with the version of LIBPNG
# installed on this system.
set(CMAKE_REQUIRED_LIBRARIES ${PNG_LIBRARY})
CHECK_FUNCTION_EXISTS(png_create_read_struct LIBPNG_IS_GOOD)
if (PNG_FOUND AND LIBPNG_IS_GOOD)
include_directories(${PNG_INCLUDE_DIR})
set (dlib_needed_libraries ${dlib_needed_libraries} ${PNG_LIBRARY})
else()
@ -265,7 +270,11 @@ if (NOT TARGET dlib)
if (DLIB_LINK_WITH_LIBJPEG)
# try to find libjpeg
find_package(JPEG QUIET)
if (JPEG_FOUND)
# Make sure there isn't something wrong with the version of libjpeg
# installed on this system.
set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY})
CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD)
if (JPEG_FOUND AND LIBJPEG_IS_GOOD)
include_directories(${JPEG_INCLUDE_DIR})
set (dlib_needed_libraries ${dlib_needed_libraries} ${JPEG_LIBRARY})
else()