diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-22 13:15:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-22 13:15:47 (GMT) |
| commit | 7b46f59ee184e8efd423085934ed46c101308b4c (patch) | |
| tree | 195eb545e5d7e604a6eb783eafff631ceb55a56b /Modules | |
| parent | 0375d73270483611bdf9ce005f16fd7e14e815fe (diff) | |
| parent | ae4a548302bf029fc7393dfbcd25d51746845127 (diff) | |
| download | CMake-7b46f59ee184e8efd423085934ed46c101308b4c.zip CMake-7b46f59ee184e8efd423085934ed46c101308b4c.tar.gz CMake-7b46f59ee184e8efd423085934ed46c101308b4c.tar.bz2 | |
Merge topic 'FindJPEG-fix-debug'
ae4a548302 FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variables
7876f329a9 FindJPEG: Add forgotten names of libraries for Debug configuration
Acked-by: Kitware Robot <kwrobot@kitware.com>
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) |