[Cmake-commits] CMake branch, next, updated. v3.6.1-1048-gc6e3049

[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  c6e3049340f37d3a8feb19afc184e335e41fa70e (commit)
       via  5790d9b6f5ae0b5bb8b0f2e4ec630a690b4b0301 (commit)
      from  d30c1c1e65d3a3cb2599c2b161600f196c059b49 (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=c6e3049340f37d3a8feb19afc184e335e41fa70e
commit c6e3049340f37d3a8feb19afc184e335e41fa70e
Merge: d30c1c1 5790d9b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 2 10:50:56 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 10:50:56 2016 -0400

    Merge topic 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS' into next
    
    5790d9b6 FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRS


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5790d9b6f5ae0b5bb8b0f2e4ec630a690b4b0301
commit 5790d9b6f5ae0b5bb8b0f2e4ec630a690b4b0301
Author:     Konstantin Sinitsyn <k.sinitsyn at gmail.com>
AuthorDate: Fri Jul 29 20:10:04 2016 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 2 10:50:24 2016 -0400

    FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRS
    
    Support was accidentally dropped by commit v3.6.0-rc1~273^2
    (FindProtobuf: Rename variables to match case of module name,
    2016-03-01).

diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
index 8042073..2807bb9 100644
--- a/Modules/FindProtobuf.cmake
+++ b/Modules/FindProtobuf.cmake
@@ -129,6 +129,10 @@ function(PROTOBUF_GENERATE_CPP SRCS HDRS)
     set(_protobuf_include_path -I ${CMAKE_CURRENT_SOURCE_DIR})
   endif()
 
+  if(DEFINED PROTOBUF_IMPORT_DIRS AND NOT DEFINED Protobuf_IMPORT_DIRS)
+    set(Protobuf_IMPORT_DIRS "${PROTOBUF_IMPORT_DIRS}")
+  endif()
+
   if(DEFINED Protobuf_IMPORT_DIRS)
     foreach(DIR ${Protobuf_IMPORT_DIRS})
       get_filename_component(ABS_PATH ${DIR} ABSOLUTE)
@@ -183,6 +187,10 @@ function(PROTOBUF_GENERATE_PYTHON SRCS)
     set(_protobuf_include_path -I ${CMAKE_CURRENT_SOURCE_DIR})
   endif()
 
+  if(DEFINED PROTOBUF_IMPORT_DIRS AND NOT DEFINED Protobuf_IMPORT_DIRS)
+    set(Protobuf_IMPORT_DIRS "${PROTOBUF_IMPORT_DIRS}")
+  endif()
+
   if(DEFINED Protobuf_IMPORT_DIRS)
     foreach(DIR ${Protobuf_IMPORT_DIRS})
       get_filename_component(ABS_PATH ${DIR} ABSOLUTE)

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

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


hooks/post-receive
-- 
CMake