diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-21 14:50:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-21 14:50:48 (GMT) |
| commit | 5dc9f440c5c368ce67de52130a845bb5a5089a0e (patch) | |
| tree | 14a4141b54096f92bdab3b6253df6850c5d26deb /Modules | |
| parent | ecbaed7ad6483f9a679855def48a70f1c1a43077 (diff) | |
| parent | ae4a548302bf029fc7393dfbcd25d51746845127 (diff) | |
| download | CMake-5dc9f440c5c368ce67de52130a845bb5a5089a0e.zip CMake-5dc9f440c5c368ce67de52130a845bb5a5089a0e.tar.gz CMake-5dc9f440c5c368ce67de52130a845bb5a5089a0e.tar.bz2 | |
Merge branch 'FindJPEG-fix-debug' into release-3.12
Merge-request: !2159
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindJPEG.cmake | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake index 61a2213..7290724 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -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) |