Merge topic 'FindProtobuf_import_dirs'
27bc9e2
FindProtobuf: Update documentation comment for 2.8.884079c9
FindProtobuf: Merge patch that allows extra import dirs
This commit is contained in:
commit
c6a33dce36
|
@ -7,6 +7,9 @@
|
|||
# (vsprojects/Debug & vsprojects/Release) will be searched
|
||||
# for libraries and binaries.
|
||||
#
|
||||
# PROTOBUF_IMPORT_DIRS - List of additional directories to be searched for
|
||||
# imported .proto files. (New in CMake 2.8.8)
|
||||
#
|
||||
# Defines the following variables:
|
||||
#
|
||||
# PROTOBUF_FOUND - Found the Google Protocol Buffers library (libprotobuf & header files)
|
||||
|
@ -91,6 +94,16 @@ function(PROTOBUF_GENERATE_CPP SRCS HDRS)
|
|||
set(_protobuf_include_path -I ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
endif()
|
||||
|
||||
if(DEFINED PROTOBUF_IMPORT_DIRS)
|
||||
foreach(DIR ${PROTOBUF_IMPORT_DIRS})
|
||||
get_filename_component(ABS_PATH ${DIR} ABSOLUTE)
|
||||
list(FIND _protobuf_include_path ${ABS_PATH} _contains_already)
|
||||
if(${_contains_already} EQUAL -1)
|
||||
list(APPEND _protobuf_include_path -I ${ABS_PATH})
|
||||
endif()
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
set(${SRCS})
|
||||
set(${HDRS})
|
||||
foreach(FIL ${ARGN})
|
||||
|
|
Loading…
Reference in New Issue