mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-12 20:39:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Protobuf: restore 'PROTOBUF_IMPORT_DIRS' check

Browse Source 
This was not present in the upstream code.
This commit is contained in:
André Apitzsch
2018-07-12 14:27:04 +02:00
committed by Brad King
parent 1bcc0f3678
commit 1385b4b113
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindProtobuf.cmake
View File

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