[Cmake-commits] CMake branch, next, updated. v3.0.0-3962-g9e150f5

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9e150f53f1241ea9910b9b0a504825fe657a9d84 (commit)
       via  115811dcbd9253cd662b2cd9c15c844d07aa5679 (commit)
      from  41381633529bd60a265e640a5ac339eb75e75958 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e150f53f1241ea9910b9b0a504825fe657a9d84
commit 9e150f53f1241ea9910b9b0a504825fe657a9d84
Merge: 4138163 115811d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 27 09:25:57 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 27 09:25:57 2014 -0400

    Merge topic 'FindJPEG-new-windows-name' into next
    
    115811dc FindJPEG: Add alternative name 'libjpeg'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=115811dcbd9253cd662b2cd9c15c844d07aa5679
commit 115811dcbd9253cd662b2cd9c15c844d07aa5679
Author:     Sebastian Elsner <sebastian at risefx.com>
AuthorDate: Thu Jun 26 21:12:29 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 27 09:26:05 2014 -0400

    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.

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

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindJPEG.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake