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 | ac9353f960e6272250dc0e73edef74fc13716bc3 (patch) | |
| tree | 8c1d698dbfba74fca74deb12500af4ed26e06405 | |
| parent | 734484bfbc4493819ca0d5c7d087dd2778b36cc9 (diff) | |
| parent | 0de1f1503bfdc990a7e6f62e6b486c872838e85d (diff) | |
| download | CMake-ac9353f960e6272250dc0e73edef74fc13716bc3.zip CMake-ac9353f960e6272250dc0e73edef74fc13716bc3.tar.gz CMake-ac9353f960e6272250dc0e73edef74fc13716bc3.tar.bz2 | |
Merge topic 'FindJPEG-revert-turbo'
0de1f1503b FindJPEG: Revert "Search for 'turbojpeg' and 'turbojpeg-static' too"
Acked-by: Kitware Robot <kwrobot@kitware.com>
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() |