From e8ae76fbde910720faa1708b6910f6ba7275e8aa Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.vonarnim@gmail.com>
Date: Mon, 14 May 2018 08:52:28 +0200
Subject: cmake: Use GENERATE_EXTENSIONS parameter in protobuf_generate

---
 cmake/protobuf-config.cmake.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'cmake')

diff --git a/cmake/protobuf-config.cmake.in b/cmake/protobuf-config.cmake.in
index acedcc7a..0e2380a8 100644
--- a/cmake/protobuf-config.cmake.in
+++ b/cmake/protobuf-config.cmake.in
@@ -38,11 +38,11 @@ function(protobuf_generate)
     set(_dll_export_decl "dllexport_decl=${protobuf_generate_EXPORT_MACRO}:")
   endif()
 
-  if(NOT protobuf_GENERATE_EXTENSIONS)
+  if(NOT protobuf_generate_GENERATE_EXTENSIONS)
     if(protobuf_generate_LANGUAGE STREQUAL cpp)
-      set(protobuf_GENERATE_EXTENSIONS .pb.h .pb.cc)
+      set(protobuf_generate_GENERATE_EXTENSIONS .pb.h .pb.cc)
     elseif(protobuf_generate_LANGUAGE STREQUAL python)
-      set(protobuf_GENERATE_EXTENSIONS _pb2.py)
+      set(protobuf_generate_GENERATE_EXTENSIONS _pb2.py)
     else()
       message(SEND_ERROR "Error: protobuf_generate given unknown Language ${LANGUAGE}, please provide a value for GENERATE_EXTENSIONS")
       return()
@@ -91,7 +91,7 @@ function(protobuf_generate)
     get_filename_component(_basename ${_proto} NAME_WE)
 
     set(_generated_srcs)
-    foreach(_ext ${protobuf_GENERATE_EXTENSIONS})
+    foreach(_ext ${protobuf_generate_GENERATE_EXTENSIONS})
       list(APPEND _generated_srcs "${CMAKE_CURRENT_BINARY_DIR}/${_basename}${_ext}")
     endforeach()
     list(APPEND _generated_srcs_all ${_generated_srcs})
-- 
cgit v1.2.3


From b9c0c5f526206f2d9b56522089f3abd0c329429a Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.vonarnim@gmail.com>
Date: Mon, 14 May 2018 09:03:42 +0200
Subject: cmake: Add parameter PROTOC_OUT_DIR to protobuf_generate

---
 cmake/protobuf-config.cmake.in | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'cmake')

diff --git a/cmake/protobuf-config.cmake.in b/cmake/protobuf-config.cmake.in
index 0e2380a8..a40b7fd1 100644
--- a/cmake/protobuf-config.cmake.in
+++ b/cmake/protobuf-config.cmake.in
@@ -11,7 +11,7 @@ function(protobuf_generate)
   include(CMakeParseArguments)
 
   set(_options APPEND_PATH)
-  set(_singleargs LANGUAGE OUT_VAR EXPORT_MACRO)
+  set(_singleargs LANGUAGE OUT_VAR EXPORT_MACRO PROTOC_OUT_DIR)
   if(COMMAND target_sources)
     list(APPEND _singleargs TARGET)
   endif()
@@ -34,6 +34,10 @@ function(protobuf_generate)
   endif()
   string(TOLOWER ${protobuf_generate_LANGUAGE} protobuf_generate_LANGUAGE)
 
+  if(NOT protobuf_generate_PROTOC_OUT_DIR)
+    set(protobuf_generate_PROTOC_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+  endif()
+  
   if(protobuf_generate_EXPORT_MACRO AND protobuf_generate_LANGUAGE STREQUAL cpp)
     set(_dll_export_decl "dllexport_decl=${protobuf_generate_EXPORT_MACRO}:")
   endif()
@@ -92,14 +96,14 @@ function(protobuf_generate)
 
     set(_generated_srcs)
     foreach(_ext ${protobuf_generate_GENERATE_EXTENSIONS})
-      list(APPEND _generated_srcs "${CMAKE_CURRENT_BINARY_DIR}/${_basename}${_ext}")
+      list(APPEND _generated_srcs "${protobuf_generate_PROTOC_OUT_DIR}/${_basename}${_ext}")
     endforeach()
     list(APPEND _generated_srcs_all ${_generated_srcs})
 
     add_custom_command(
       OUTPUT ${_generated_srcs}
       COMMAND  protobuf::protoc
-      ARGS --${protobuf_generate_LANGUAGE}_out ${_dll_export_decl}${CMAKE_CURRENT_BINARY_DIR} ${_protobuf_include_path} ${_abs_file}
+      ARGS --${protobuf_generate_LANGUAGE}_out ${_dll_export_decl}${protobuf_generate_PROTOC_OUT_DIR} ${_protobuf_include_path} ${_abs_file}
       DEPENDS ${ABS_FIL} protobuf::protoc
       COMMENT "Running ${protobuf_generate_LANGUAGE} protocol buffer compiler on ${_proto}"
       VERBATIM )
-- 
cgit v1.2.3


From 411018e3fb6ca5d7610ee48139ecaef1033746e3 Mon Sep 17 00:00:00 2001
From: Christian von Arnim <christian.vonarnim@gmail.com>
Date: Tue, 15 May 2018 09:06:54 +0200
Subject: cmake: Fix DEPENDS of add_custom_command in protobuf_generate

---
 cmake/protobuf-config.cmake.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmake')

diff --git a/cmake/protobuf-config.cmake.in b/cmake/protobuf-config.cmake.in
index a40b7fd1..3480c17c 100644
--- a/cmake/protobuf-config.cmake.in
+++ b/cmake/protobuf-config.cmake.in
@@ -104,7 +104,7 @@ function(protobuf_generate)
       OUTPUT ${_generated_srcs}
       COMMAND  protobuf::protoc
       ARGS --${protobuf_generate_LANGUAGE}_out ${_dll_export_decl}${protobuf_generate_PROTOC_OUT_DIR} ${_protobuf_include_path} ${_abs_file}
-      DEPENDS ${ABS_FIL} protobuf::protoc
+      DEPENDS ${_abs_file} protobuf::protoc
       COMMENT "Running ${protobuf_generate_LANGUAGE} protocol buffer compiler on ${_proto}"
       VERBATIM )
   endforeach()
-- 
cgit v1.2.3