[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-175-ge7dbcb3

[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  e7dbcb39f983dd6640bcc5336601a0d327c1209f (commit)
       via  d4b8e8135358024b6982100654a430358574efb2 (commit)
      from  c9281fd5147ba30d4da375ddbfa27bc1854b0220 (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=e7dbcb39f983dd6640bcc5336601a0d327c1209f
commit e7dbcb39f983dd6640bcc5336601a0d327c1209f
Merge: c9281fd d4b8e81
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 9 10:27:18 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 9 10:27:18 2016 -0400

    Merge topic 'FindProtobuf-proto-in-subdirs' into next
    
    d4b8e813 FindProtobuf: fix protobuf_generate_*() to handle proto files in subdirs.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4b8e8135358024b6982100654a430358574efb2
commit d4b8e8135358024b6982100654a430358574efb2
Author:     Vladimír Vondruš <mosra at centrum.cz>
AuthorDate: Thu Jun 9 15:53:17 2016 +0200
Commit:     Vladimír Vondruš <mosra at centrum.cz>
CommitDate: Thu Jun 9 16:13:45 2016 +0200

    FindProtobuf: fix protobuf_generate_*() to handle proto files in subdirs.

diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 8042073..c90a0a2 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -144,6 +144,10 @@ function(PROTOBUF_GENERATE_CPP SRCS HDRS)
   foreach(FIL ${ARGN})
     get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
     get_filename_component(FIL_WE ${FIL} NAME_WE)
+    get_filename_component(FIL_DIR ${FIL} DIRECTORY)
+    if(FIL_DIR)
+      set(FIL_WE "${FIL_DIR}/${FIL_WE}")
+    endif()
 
     list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
     list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
@@ -197,6 +201,10 @@ function(PROTOBUF_GENERATE_PYTHON SRCS)
   foreach(FIL ${ARGN})
     get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
     get_filename_component(FIL_WE ${FIL} NAME_WE)
+    get_filename_component(FIL_DIR ${FIL} DIRECTORY)
+    if(FIL_DIR)
+      set(FIL_WE "${FIL_DIR}/${FIL_WE}")
+    endif()
 
     list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}_pb2.py")
     add_custom_command(

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

Summary of changes:
 Modules/FindProtobuf.cmake |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake