summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-06-30 18:50:31 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-06-30 18:50:31 (GMT)
commit2e8a5ac31f3f95cd01cfde4f86dc78d091b13d7e (patch)
tree55305f3c403efa450b4d6fb52424d6912c57e5ae /Modules
parentad8442075d1cd802adcd4b9a25b93901c1faaa3f (diff)
parent115811dcbd9253cd662b2cd9c15c844d07aa5679 (diff)
downloadCMake-2e8a5ac31f3f95cd01cfde4f86dc78d091b13d7e.zip
CMake-2e8a5ac31f3f95cd01cfde4f86dc78d091b13d7e.tar.gz
CMake-2e8a5ac31f3f95cd01cfde4f86dc78d091b13d7e.tar.bz2
Merge topic 'FindJPEG-new-windows-name'
115811dc FindJPEG: Add alternative name 'libjpeg'
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindJPEG.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake
index 90e4485..86bb6e5 100644
--- a/Modules/FindJPEG.cmake
+++ b/Modules/FindJPEG.cmake
@@ -33,7 +33,7 @@
find_path(JPEG_INCLUDE_DIR jpeglib.h)
-set(JPEG_NAMES ${JPEG_NAMES} jpeg)
+set(JPEG_NAMES ${JPEG_NAMES} jpeg libjpeg)
find_library(JPEG_LIBRARY NAMES ${JPEG_NAMES} )
# handle the QUIETLY and REQUIRED arguments and set JPEG_FOUND to TRUE if