Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
eded3773
Commit
eded3773
authored
Jun 27, 2018
by
Davis King
Browse files
Never use anaconda's version of libpng because it's broken.
parent
6b581d91
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
dlib/CMakeLists.txt
dlib/CMakeLists.txt
+3
-2
No files found.
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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment