diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-14 13:33:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-14 13:33:06 (GMT) |
| commit | 41653c6df67dcee3f1ee264dc67ed5204c86f5f1 (patch) | |
| tree | 197a426f759c23b4a6781918444ac74cb348ee2b /Modules | |
| parent | a04ca510c1d79a52768a247af6f115aeb26e1837 (diff) | |
| parent | 322eab042948463c278b9ddec7f07f6ca84c5fe9 (diff) | |
| download | CMake-41653c6df67dcee3f1ee264dc67ed5204c86f5f1.zip CMake-41653c6df67dcee3f1ee264dc67ed5204c86f5f1.tar.gz CMake-41653c6df67dcee3f1ee264dc67ed5204c86f5f1.tar.bz2 | |
Merge topic 'findjpeg_static_fix'
322eab0429 FindJPEG: Add 'jpeg-static' to searched names
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2059
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindJPEG.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake index 9542f69..61a2213 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -51,7 +51,7 @@ find_path(JPEG_INCLUDE_DIR jpeglib.h) -set(jpeg_names ${JPEG_NAMES} jpeg libjpeg) +set(jpeg_names ${JPEG_NAMES} jpeg jpeg-static libjpeg libjpeg-static) foreach(name ${JPEG_NAMES}) list(APPEND jpeg_names_debug "${name}d") endforeach() |