[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-366-ge5c68d0

[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  e5c68d04f4eb28ab4f967fe1f127be6b28c0ec92 (commit)
       via  d9190f3308fb67f01f061038a06006af73a77da1 (commit)
      from  6cb01ac244b6476c2677cf2b2114e9044886c747 (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=e5c68d04f4eb28ab4f967fe1f127be6b28c0ec92
commit e5c68d04f4eb28ab4f967fe1f127be6b28c0ec92
Merge: 6cb01ac d9190f3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 10 15:50:27 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 10 15:50:27 2016 -0400

    Merge topic 'FindProtobuf-debug-suffix' into next
    
    d9190f33 FindProtobuf: Search for debug library named with `d` suffix


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9190f3308fb67f01f061038a06006af73a77da1
commit d9190f3308fb67f01f061038a06006af73a77da1
Author:     Adam Martin <adam.madram at gmail.com>
AuthorDate: Mon Oct 10 14:17:10 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 10 15:44:21 2016 -0400

    FindProtobuf: Search for debug library named with `d` suffix
    
    Protobuf now provides a CMake-based build system that optionally adds a
    suffix to the debug library name [1].  Update our `find_library` call to
    consider names with the default value for this suffix, `d`.
    
    [1] https://github.com/google/protobuf/blob/431cee60/cmake/libprotoc.cmake#L107

diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 14e392a..3ffd5a7 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -264,7 +264,7 @@ function(_protobuf_find_libraries name filename)
     mark_as_advanced(${name}_LIBRARY_RELEASE)
 
     find_library(${name}_LIBRARY_DEBUG
-      NAMES ${filename}
+      NAMES ${filename}d ${filename}
       PATHS ${Protobuf_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug)
     mark_as_advanced(${name}_LIBRARY_DEBUG)
 

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

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


hooks/post-receive
-- 
CMake