Commit 5dc9f440 authored by Brad King's avatar Brad King

Merge branch 'FindJPEG-fix-debug' into release-3.12

Merge-request: !2159
parents ecbaed7a ae4a5483
......@@ -52,7 +52,7 @@
find_path(JPEG_INCLUDE_DIR jpeglib.h)
set(jpeg_names ${JPEG_NAMES} jpeg jpeg-static libjpeg libjpeg-static)
foreach(name ${JPEG_NAMES})
foreach(name ${jpeg_names})
list(APPEND jpeg_names_debug "${name}d")
endforeach()
......@@ -122,10 +122,4 @@ if(JPEG_FOUND)
endif()
endif()
# Deprecated declarations.
set(NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR})
if(JPEG_LIBRARY)
get_filename_component(NATIVE_JPEG_LIB_PATH ${JPEG_LIBRARY} PATH)
endif()
mark_as_advanced(JPEG_LIBRARY JPEG_INCLUDE_DIR)
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