[Cmake-commits] CMake branch, next, updated. v2.8.4-1615-g1f4e39e

[Philip Lowman]

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  1f4e39e7539a193981a6bdabf5174bea3e0da271 (commit)
       via  abd9327fecf1123a36fb44335a6d68298bcb9c1e (commit)
      from  4b1bd050a90944babc637eca6a9e822c3f057055 (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=1f4e39e7539a193981a6bdabf5174bea3e0da271
commit 1f4e39e7539a193981a6bdabf5174bea3e0da271
Merge: 4b1bd05 abd9327
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Wed May 25 22:45:20 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 25 22:45:20 2011 -0400

    Merge topic '10997_PROTOBDUF_GENERATE_CPP_returns_wrong_path' into next
    
    abd9327 FindProtobuf: Fix PROTOBUF_GENERATE_CPP macro to support subdirectories


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abd9327fecf1123a36fb44335a6d68298bcb9c1e
commit abd9327fecf1123a36fb44335a6d68298bcb9c1e
Author:     Philip Lowman <philip at yhbt.com>
AuthorDate: Wed May 25 22:42:36 2011 -0400
Commit:     Philip Lowman <philip at yhbt.com>
CommitDate: Wed May 25 22:42:36 2011 -0400

    FindProtobuf: Fix PROTOBUF_GENERATE_CPP macro to support subdirectories
    
    Thanks to bcmpinc on bugtracker for the patch

diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index a6e6653..fe3583d 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -61,8 +61,9 @@ function(PROTOBUF_GENERATE_CPP SRCS HDRS)
   set(${HDRS})
   foreach(FIL ${ARGN})
     get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
-    get_filename_component(FIL_WE ${FIL} NAME_WE)
-    
+    file(RELATIVE_PATH REL_FIL ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL})
+    string(REGEX REPLACE ".proto$" "" FIL_WE ${REL_FIL})
+
     list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
     list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
 

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

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


hooks/post-receive
-- 
CMake