diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-12 12:32:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-12 12:32:18 (GMT) |
| commit | 79ca88ccd8bc931490e5a0ccc509f6ddd7015ec5 (patch) | |
| tree | 862f098f03c689968196cde6d743ea0d86d1464c /Modules | |
| parent | 554ebf643dfad2eb6877c3d5530b005cee453513 (diff) | |
| parent | 0de1f1503bfdc990a7e6f62e6b486c872838e85d (diff) | |
| download | CMake-79ca88ccd8bc931490e5a0ccc509f6ddd7015ec5.zip CMake-79ca88ccd8bc931490e5a0ccc509f6ddd7015ec5.tar.gz CMake-79ca88ccd8bc931490e5a0ccc509f6ddd7015ec5.tar.bz2 | |
Merge topic 'FindJPEG-revert-turbo' into release-3.21
0de1f1503b FindJPEG: Revert "Search for 'turbojpeg' and 'turbojpeg-static' too"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6326
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 add2486..3f243de 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -58,7 +58,7 @@ Obsolete variables find_path(JPEG_INCLUDE_DIR jpeglib.h) -set(jpeg_names ${JPEG_NAMES} jpeg jpeg-static libjpeg libjpeg-static turbojpeg turbojpeg-static) +set(jpeg_names ${JPEG_NAMES} jpeg jpeg-static libjpeg libjpeg-static) foreach(name ${jpeg_names}) list(APPEND jpeg_names_debug "${name}d") endforeach() |