[Cmake-commits] CMake branch, next, updated. v3.4.1-1718-ga41efac

[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  a41efac3d6559d8efdc013321483ba32da5e5be3 (commit)
       via  2908103d04daeaf396173b6f868f2cad5eb47b08 (commit)
      from  f970a8a319f6ab69a734452e3d6d3c7264bec722 (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=a41efac3d6559d8efdc013321483ba32da5e5be3
commit a41efac3d6559d8efdc013321483ba32da5e5be3
Merge: f970a8a 2908103
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 11 10:04:50 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 11 10:04:50 2015 -0500

    Merge topic 'FindProtobuf-fix-case' into next
    
    2908103d FindProtobuf: Set Protobuf_FOUND in addition to PROTOBUF_FOUND


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2908103d04daeaf396173b6f868f2cad5eb47b08
commit 2908103d04daeaf396173b6f868f2cad5eb47b08
Author:     Sebastian Schuberth <sschuberth at gmail.com>
AuthorDate: Fri Dec 11 10:11:16 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 11 10:03:22 2015 -0500

    FindProtobuf: Set Protobuf_FOUND in addition to PROTOBUF_FOUND
    
    All other modules use their module name (e.g. XxX for FindXxX.cmake) in
    find_package_handle_standard_args. Protobuf used all-caps, which triggers
    a bug when we try to find Protobuf with the CMakeFindDependencyMacro.cmake
    macro, which only checks for the mixed-case _FOUND.

diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 4a68cd1..2f13b09 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -305,7 +305,7 @@ mark_as_advanced(PROTOBUF_PROTOC_EXECUTABLE)
 
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PROTOBUF DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Protobuf DEFAULT_MSG
     PROTOBUF_LIBRARY PROTOBUF_INCLUDE_DIR)
 
 if(PROTOBUF_FOUND)

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

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


hooks/post-receive
-- 
CMake