[Cmake-commits] CMake branch, next, updated. v2.8.7-2501-g7e8cbbe

[David Cole]

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  7e8cbbe4d1d6a939ee5944a17cc7934e51f67379 (commit)
       via  efeadb19a0a901462d5b073c08d4e9ac42d60952 (commit)
      from  200b7602eab3af933a85a8c8c85f11a9cff175b7 (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=7e8cbbe4d1d6a939ee5944a17cc7934e51f67379
commit 7e8cbbe4d1d6a939ee5944a17cc7934e51f67379
Merge: 200b760 efeadb1
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Feb 7 15:41:56 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 7 15:41:56 2012 -0500

    Merge topic 'FindProtobuf_import_dirs' into next
    
    efeadb1 Revert "FindProtobuf: Remove CMake version comments"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efeadb19a0a901462d5b073c08d4e9ac42d60952
commit efeadb19a0a901462d5b073c08d4e9ac42d60952
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Feb 7 15:41:01 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Feb 7 15:41:01 2012 -0500

    Revert "FindProtobuf: Remove CMake version comments"
    
    This reverts commit 29b2426d8321d0ffb0ccc8d6cb43d614753147a6.

diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 6faa262..1e1e493 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -8,13 +8,14 @@
 #                              for libraries and binaries.
 #
 #   PROTOBUF_IMPORT_DIRS     - List of additional directories to be searched for
-#                              imported .proto files.
+#                              imported .proto files. (New in CMake 2.8.8)
 #
 # Defines the following variables:
 #
 #   PROTOBUF_FOUND - Found the Google Protocol Buffers library (libprotobuf & header files)
 #   PROTOBUF_INCLUDE_DIRS - Include directories for Google Protocol Buffers
 #   PROTOBUF_LIBRARIES - The protobuf libraries
+# [New in CMake 2.8.5]
 #   PROTOBUF_PROTOC_LIBRARIES - The protoc libraries
 #   PROTOBUF_LITE_LIBRARIES - The protobuf-lite libraries
 #
@@ -23,6 +24,7 @@
 #   PROTOBUF_PROTOC_LIBRARY   - The protoc library
 #   PROTOBUF_INCLUDE_DIR - The include directory for protocol buffers
 #   PROTOBUF_PROTOC_EXECUTABLE - The protoc compiler
+# [New in CMake 2.8.5]
 #   PROTOBUF_LIBRARY_DEBUG - The protobuf library (debug)
 #   PROTOBUF_PROTOC_LIBRARY_DEBUG   - The protoc library (debug)
 #   PROTOBUF_LITE_LIBRARY - The protobuf lite library

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

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


hooks/post-receive
-- 
CMake