[Cmake-commits] CMake branch, next, updated. v3.3.1-2933-ga7d96ec

[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  a7d96ecc983b16aa135d3f3a36d6b4d9d605ca85 (commit)
       via  abc1d65cdb258222c12aa05c856f13efa2ca038f (commit)
      from  664a9b09edd414a6be33eaa5b7d5e7536c47cd5c (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=a7d96ecc983b16aa135d3f3a36d6b4d9d605ca85
commit a7d96ecc983b16aa135d3f3a36d6b4d9d605ca85
Merge: 664a9b0 abc1d65
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 15 08:27:49 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 15 08:27:49 2015 -0400

    Merge topic 'FindProtobuf-python-extension' into next
    
    abc1d65c FIXED: Python file endings in PROTOBUF_GENERATE_PYTHON are now correct.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abc1d65cdb258222c12aa05c856f13efa2ca038f
commit abc1d65cdb258222c12aa05c856f13efa2ca038f
Author:     Andreas Bergmeier <a.bergmeier at dsfishlabs.com>
AuthorDate: Tue Sep 15 10:31:02 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 15 08:27:31 2015 -0400

    FIXED: Python file endings in PROTOBUF_GENERATE_PYTHON are now correct.

diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 6bf565b..4a68cd1 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -194,10 +194,10 @@ function(PROTOBUF_GENERATE_PYTHON SRCS)
     get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
     get_filename_component(FIL_WE ${FIL} NAME_WE)
 
-    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.py")
+    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}_pb2.py")
     add_custom_command(
-      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.py"
-      COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --python_out  ${CMAKE_CURRENT_BINARY_DIR} ${_protobuf_include_path} ${ABS_FIL}
+      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}_pb2.py"
+      COMMAND  ${PROTOBUF_PROTOC_EXECUTABLE} --python_out ${CMAKE_CURRENT_BINARY_DIR} ${_protobuf_include_path} ${ABS_FIL}
       DEPENDS ${ABS_FIL} ${PROTOBUF_PROTOC_EXECUTABLE}
       COMMENT "Running Python protocol buffer compiler on ${FIL}"
       VERBATIM )

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

Summary of changes:
 Modules/FindProtobuf.cmake |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake