[Cmake-commits] CMake branch, master, updated. v3.12.0-rc1-78-g7b46f59

[Kitware Robot]

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, master has been updated
       via  7b46f59ee184e8efd423085934ed46c101308b4c (commit)
       via  ae4a548302bf029fc7393dfbcd25d51746845127 (commit)
       via  7876f329a95c361bae2805ad8117e62f4e0b65e1 (commit)
      from  0375d73270483611bdf9ce005f16fd7e14e815fe (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b46f59ee184e8efd423085934ed46c101308b4c
commit 7b46f59ee184e8efd423085934ed46c101308b4c
Merge: 0375d73 ae4a548
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 22 13:15:40 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jun 22 09:15:47 2018 -0400

    Merge topic 'FindJPEG-fix-debug'
    
    ae4a548302 FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variables
    7876f329a9 FindJPEG: Add forgotten names of libraries for Debug configuration
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2159


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae4a548302bf029fc7393dfbcd25d51746845127
commit ae4a548302bf029fc7393dfbcd25d51746845127
Author:     Andrey Karpov <ndk at yandex.ru>
AuthorDate: Wed Jun 20 12:41:11 2018 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 21 10:47:03 2018 -0400

    FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variables
    
    These have been deprecated since 2002!

diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake
index 710188e..7290724 100644
--- a/Modules/FindJPEG.cmake
+++ b/Modules/FindJPEG.cmake
@@ -122,10 +122,4 @@ if(JPEG_FOUND)
   endif()
 endif()
 
-# Deprecated declarations.
-set(NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR})
-if(JPEG_LIBRARY)
-  get_filename_component(NATIVE_JPEG_LIB_PATH ${JPEG_LIBRARY} PATH)
-endif()
-
 mark_as_advanced(JPEG_LIBRARY JPEG_INCLUDE_DIR)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7876f329a95c361bae2805ad8117e62f4e0b65e1
commit 7876f329a95c361bae2805ad8117e62f4e0b65e1
Author:     Andrey Karpov <ndk at yandex.ru>
AuthorDate: Wed Jun 20 12:35:22 2018 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 21 10:47:03 2018 -0400

    FindJPEG: Add forgotten names of libraries for Debug configuration
    
    The change in commit v3.12.0-rc1~202^2~1 (FindJPEG: Add multi config
    support and associated docs, 2018-04-17) accidentally left out the
    default jpeg library names from consideration for debug variants.

diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake
index 61a2213..710188e 100644
--- a/Modules/FindJPEG.cmake
+++ b/Modules/FindJPEG.cmake
@@ -52,7 +52,7 @@
 find_path(JPEG_INCLUDE_DIR jpeglib.h)
 
 set(jpeg_names ${JPEG_NAMES} jpeg jpeg-static libjpeg libjpeg-static)
-foreach(name ${JPEG_NAMES})
+foreach(name ${jpeg_names})
   list(APPEND jpeg_names_debug "${name}d")
 endforeach()
 

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

Summary of changes:
 Modules/FindJPEG.cmake | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)


hooks/post-receive
-- 
CMake