Skip to content

GitLab

Commit 132b1abd authored by Davis King's avatar Davis King
Browse files

Made cmake not use the installed libjpeg on apple systems because it's broken 

on some newer OS X installs.
parent 01f030dd
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
dlib/CMakeLists.txt
View file @ 132b1abd
...@@ -271,10 +271,11 @@ if (NOT TARGET dlib) ...@@ -271,10 +271,11 @@ if (NOT TARGET dlib)
# try to find libjpeg # try to find libjpeg
find_package(JPEG QUIET) find_package(JPEG QUIET)
# Make sure there isn't something wrong with the version of libjpeg # Make sure there isn't something wrong with the version of libjpeg
# installed on this system. # installed on this system. Also don't use the installed libjpeg
# if this is an APPLE system because apparently it's broken (as of 2015/01/01).
set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY}) set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY})
CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD) CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD)
if (JPEG_FOUND AND LIBJPEG_IS_GOOD) if (JPEG_FOUND AND LIBJPEG_IS_GOOD AND NOT APPLE)
include_directories(${JPEG_INCLUDE_DIR}) include_directories(${JPEG_INCLUDE_DIR})
set (dlib_needed_libraries ${dlib_needed_libraries} ${JPEG_LIBRARY}) set (dlib_needed_libraries ${dlib_needed_libraries} ${JPEG_LIBRARY})
else() else()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment