"git@developer.sourcefind.cn:OpenDAS/dlib.git" did not exist on "e7baa7665502e518cc2053096afdf265cf5c21db"
Commit 82ecd447 authored by Davis King's avatar Davis King
Browse files

Don't ever try to use the busted version of libjpeg in anaconda.

parent f88fd99e
...@@ -254,7 +254,7 @@ if (NOT TARGET dlib) ...@@ -254,7 +254,7 @@ if (NOT TARGET dlib)
# If both X11 and anaconda are installed, it's possible for the # If both X11 and anaconda are installed, it's possible for the
# anaconda path to appear before /opt/X11, so we remove anaconda. # anaconda path to appear before /opt/X11, so we remove anaconda.
foreach (ITR ${X11_INCLUDE_DIR}) foreach (ITR ${X11_INCLUDE_DIR})
if ("${ITR}" MATCHES "(.*)(ana|mini)conda(.*)") if ("${ITR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)")
list (REMOVE_ITEM X11_INCLUDE_DIR ${ITR}) list (REMOVE_ITEM X11_INCLUDE_DIR ${ITR})
endif () endif ()
endforeach(ITR) endforeach(ITR)
...@@ -422,7 +422,7 @@ if (NOT TARGET dlib) ...@@ -422,7 +422,7 @@ if (NOT TARGET dlib)
# 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. Also don't use the installed libjpeg # 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). # if this is an APPLE system because apparently it's broken (as of 2015/01/01).
if (JPEG_FOUND) if (JPEG_FOUND AND NOT ("${JPEG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)"))
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)
endif() endif()
......
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