[arrow] branch master updated: ARROW-4898: [C++] Old versions of FindProtobuf.cmake use ALL-CAPS for variables

[wesm]

This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 3b959a3  ARROW-4898: [C++] Old versions of FindProtobuf.cmake use 
ALL-CAPS for variables
3b959a3 is described below

commit 3b959a32376ce449c5b3164503dd18a0a8b3a1b3
Author: Korn, Uwe <uwe.k...@blue-yonder.com>
AuthorDate: Fri Mar 15 12:49:15 2019 -0500

    ARROW-4898: [C++] Old versions of FindProtobuf.cmake use ALL-CAPS for 
variables
    
    Author: Korn, Uwe <uwe.k...@blue-yonder.com>
    
    Closes #3919 from xhochy/ARROW-4898 and squashes the following commits:
    
    dea6b6f95 <Korn, Uwe> ARROW-4898:  Old versions of FindProtobuf.cmake use 
ALL-CAPS for variables
---
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake 
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 09ee367..112c119 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -987,6 +987,10 @@ if (ARROW_WITH_PROTOBUF)
     )
   endif()
   if (NOT TARGET protobuf::libprotoc)
+    if (PROTOBUF_PROTOC_LIBRARY AND NOT Protobuf_PROTOC_LIBRARY)
+      # Old CMake versions have a different casing.
+      set(Protobuf_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY})
+    endif()
     if (NOT Protobuf_PROTOC_LIBRARY)
       message(FATAL_ERROR "libprotoc was set to ${Protobuf_PROTOC_LIBRARY}")
     endif()