diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-09 11:52:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-09 11:52:09 (GMT) |
| commit | ad793ce82544a0c88b2a612724c62fd93c94781b (patch) | |
| tree | 7d15d0c7a5b6547c2992d402c6a577aa682a3fe7 | |
| parent | d2419c4132a18ccebdb7231965a59598e17750d8 (diff) | |
| parent | 0de1f1503bfdc990a7e6f62e6b486c872838e85d (diff) | |
| download | CMake-ad793ce82544a0c88b2a612724c62fd93c94781b.zip CMake-ad793ce82544a0c88b2a612724c62fd93c94781b.tar.gz CMake-ad793ce82544a0c88b2a612724c62fd93c94781b.tar.bz2 | |
Merge branch 'FindJPEG-revert-turbo' into release-3.20
Merge-request: !6326
| -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() |