Skip to content

GitLab

"tests/scripts/git@developer.sourcefind.cn:OpenDAS/dgl.git" did not exist on "0127a2ea4d9775c706509b25349ecbbf47ce2ccd"
Commit eded3773 authored by Davis King's avatar Davis King
Browse files

Never use anaconda's version of libpng because it's broken.

parent 6b581d91
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
dlib/CMakeLists.txt
View file @ eded3773
...@@ -405,8 +405,9 @@ if (NOT TARGET dlib) ...@@ -405,8 +405,9 @@ if (NOT TARGET dlib)
# try to find libpng # try to find libpng
find_package(PNG QUIET) find_package(PNG QUIET)
# Make sure there isn't something wrong with the version of LIBPNG # Make sure there isn't something wrong with the version of LIBPNG
# installed on this system. # installed on this system. Also never link to anything from anaconda
if (PNG_FOUND) # since it's probably broken.
if (PNG_FOUND AND NOT ("${PNG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)"))
set(CMAKE_REQUIRED_LIBRARIES ${PNG_LIBRARIES}) set(CMAKE_REQUIRED_LIBRARIES ${PNG_LIBRARIES})
CHECK_FUNCTION_EXISTS(png_create_read_struct LIBPNG_IS_GOOD) CHECK_FUNCTION_EXISTS(png_create_read_struct LIBPNG_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