summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Elsner <sebastian@risefx.com>2014-06-26 19:12:29 (GMT)
committerBrad King <brad.king@kitware.com>2014-06-27 13:26:05 (GMT)
commit115811dcbd9253cd662b2cd9c15c844d07aa5679 (patch)
tree71af4693825cc22ac95c4c4ab6b0603237691c8e
parent1f36b035041972d57947db22adbe6d326c5bc898 (diff)
downloadCMake-115811dcbd9253cd662b2cd9c15c844d07aa5679.zip
CMake-115811dcbd9253cd662b2cd9c15c844d07aa5679.tar.gz
CMake-115811dcbd9253cd662b2cd9c15c844d07aa5679.tar.bz2
FindJPEG: Add alternative name 'libjpeg'
Newer versions of jpeglib build the .lib file on Windows with a different name by default. Its now called libjpeg.lib instead of jpeg.lib.
-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