[Cmake-commits] CMake branch, next, updated. v3.0.2-5376-gd0972b0

[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  d0972b0bd0b43181a0da50f045023f4bf5cc8b48 (commit)
       via  e380d7c5baca9de5fcb5826e2d9386a6dd57e48c (commit)
      from  33324d93216496079ec12a9f11f35faada8f988c (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=d0972b0bd0b43181a0da50f045023f4bf5cc8b48
commit d0972b0bd0b43181a0da50f045023f4bf5cc8b48
Merge: 33324d9 e380d7c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 18 09:18:21 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 18 09:18:21 2014 -0400

    Merge topic 'FindProtobuf-depend-protoc' into next
    
    e380d7c5 FindProtobuf: Make outputs depend on protoc executable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e380d7c5baca9de5fcb5826e2d9386a6dd57e48c
commit e380d7c5baca9de5fcb5826e2d9386a6dd57e48c
Author:     Michael Hanselmann <public at hansmi.ch>
AuthorDate: Wed Sep 17 06:11:10 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 18 09:16:27 2014 -0400

    FindProtobuf: Make outputs depend on protoc executable
    
    After updating from Protocol Buffers 2.5.0 to 2.6.0 compilation of the
    generated source failed: "This file was generated by an older version of
    protoc which is incompatible with your Protocol Buffer headers. Please
    regenerate this file with a newer version of protoc.".
    
    Turns out the source and headers generated by way of
    FindProtobuf.cmake:PROTOBUF_GENERATE_CPP aren't updated. Adding a
    dependency on the compiler executable fixes this issue.

diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 9b120a6..72ca6ed 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -183,7 +183,7 @@ function(PROTOBUF_GENERATE_CPP SRCS HDRS)
              "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
       COMMAND  ${PROTOBUF_PROTOC_EXECUTABLE}
       ARGS --cpp_out  ${CMAKE_CURRENT_BINARY_DIR} ${_protobuf_include_path} ${ABS_FIL}
-      DEPENDS ${ABS_FIL}
+      DEPENDS ${ABS_FIL} ${PROTOBUF_PROTOC_EXECUTABLE}
       COMMENT "Running C++ protocol buffer compiler on ${FIL}"
       VERBATIM )
   endforeach()

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

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


hooks/post-receive
-- 
CMake