Browse Source

Protobuf: restore 'PROTOBUF_IMPORT_DIRS' check

This was not present in the upstream code.
André Apitzsch 7 years ago
parent
commit
1385b4b113
1 changed files with 8 additions and 0 deletions
  1. 8 0
      Modules/FindProtobuf.cmake

+ 8 - 0
Modules/FindProtobuf.cmake

@@ -245,6 +245,10 @@ function(PROTOBUF_GENERATE_CPP SRCS HDRS)
     set(_append_arg APPEND_PATH)
   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)
     set(_import_arg IMPORT_DIRS ${Protobuf_IMPORT_DIRS})
   endif()
@@ -275,6 +279,10 @@ function(PROTOBUF_GENERATE_PYTHON SRCS)
     set(_append_arg APPEND_PATH)
   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)
     set(_import_arg IMPORT_DIRS ${Protobuf_IMPORT_DIRS})
   endif()