summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-01-12 15:30:14 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-01-12 15:30:27 (GMT)
commitcc27ab0b2768daa0e65a6f3fde3834cee5bc3db3 (patch)
tree1ac48d313678521843f2b8f7707be68935e98c31
parentd59135312681d9e442ea026c35f892d55862fcda (diff)
parent74cc2e3326548626941c9fc912dec35e905de150 (diff)
downloadCMake-cc27ab0b2768daa0e65a6f3fde3834cee5bc3db3.zip
CMake-cc27ab0b2768daa0e65a6f3fde3834cee5bc3db3.tar.gz
CMake-cc27ab0b2768daa0e65a6f3fde3834cee5bc3db3.tar.bz2
Merge topic 'FindJPEG-turbo'
74cc2e3326 FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5683
-rw-r--r--Modules/FindJPEG.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake
index 3f243de..add2486 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)
+set(jpeg_names ${JPEG_NAMES} jpeg jpeg-static libjpeg libjpeg-static turbojpeg turbojpeg-static)
foreach(name ${jpeg_names})
list(APPEND jpeg_names_debug "${name}d")
endforeach()