feat: update protos to 2020-02-25 version (#37)
Update the dependencies based on the new protos.
This commit is contained in:
Carlos O'Ryan
GitHub
parent
3e4f8c025e
commit
c1713cb00d
6 changed files with 306 additions and 365 deletions
|
|
@ -92,9 +92,9 @@ function (_grpc_fix_grpc_cpp_plugin_target)
|
|||
DOC "The gRPC C++ plugin for protoc")
|
||||
mark_as_advanced(_gRPC_CPP_PLUGIN_EXECUTABLE)
|
||||
if (_gRPC_CPP_PLUGIN_EXECUTABLE)
|
||||
set_property(TARGET gRPC::grpc_cpp_plugin
|
||||
PROPERTY IMPORTED_LOCATION
|
||||
${_gRPC_CPP_PLUGIN_EXECUTABLE})
|
||||
set_property(
|
||||
TARGET gRPC::grpc_cpp_plugin
|
||||
PROPERTY IMPORTED_LOCATION ${_gRPC_CPP_PLUGIN_EXECUTABLE})
|
||||
else ()
|
||||
set(gRPC_FOUND "grpc_cpp_plugin-NOTFOUND")
|
||||
endif ()
|
||||
|
|
@ -106,11 +106,9 @@ endfunction ()
|
|||
function (_grpc_fix_grpc_target_definitions)
|
||||
# Including gRPC headers without this definition results in a build error.
|
||||
if (WIN32)
|
||||
set_property(TARGET gRPC::grpc
|
||||
APPEND
|
||||
set_property(TARGET gRPC::grpc APPEND
|
||||
PROPERTY INTERFACE_COMPILE_DEFINITIONS _WIN32_WINNT=0x600)
|
||||
set_property(TARGET gRPC::grpc++
|
||||
APPEND
|
||||
set_property(TARGET gRPC::grpc++ APPEND
|
||||
PROPERTY INTERFACE_COMPILE_DEFINITIONS _WIN32_WINNT=0x600)
|
||||
endif ()
|
||||
endfunction ()
|
||||
|
|
@ -155,10 +153,12 @@ function (_gRPC_find_library name filename)
|
|||
"[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
|
||||
"${name} ${filename} RELEASE=${${name}_LIBRARY}"
|
||||
" DEBUG=${${name}_LIBRARY_DEBUG} DEFAULT=${${name}_LIBRARY}"
|
||||
)
|
||||
)
|
||||
endif ()
|
||||
|
||||
set(${name}_LIBRARY "${${name}_LIBRARY}" PARENT_SCOPE)
|
||||
set(${name}_LIBRARY
|
||||
"${${name}_LIBRARY}"
|
||||
PARENT_SCOPE)
|
||||
endif ()
|
||||
endfunction ()
|
||||
|
||||
|
|
@ -196,85 +196,75 @@ endif ()
|
|||
if (_gRPC_grpc_LIBRARY)
|
||||
if (NOT TARGET gRPC::grpc)
|
||||
add_library(gRPC::grpc IMPORTED UNKNOWN)
|
||||
set_target_properties(gRPC::grpc
|
||||
PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
|
||||
"${_gRPC_INCLUDE_DIR}")
|
||||
set_target_properties(
|
||||
gRPC::grpc PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
|
||||
"${_gRPC_INCLUDE_DIR}")
|
||||
if (EXISTS "${_gRPC_grpc_LIBRARY}")
|
||||
set_target_properties(gRPC::grpc
|
||||
PROPERTIES IMPORTED_LOCATION
|
||||
"${_gRPC_grpc_LIBRARY}")
|
||||
set_target_properties(gRPC::grpc PROPERTIES IMPORTED_LOCATION
|
||||
"${_gRPC_grpc_LIBRARY}")
|
||||
endif ()
|
||||
if (EXISTS "${_gRPC_grpc_LIBRARY_RELEASE}")
|
||||
set_property(TARGET gRPC::grpc
|
||||
APPEND
|
||||
set_property(TARGET gRPC::grpc APPEND
|
||||
PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(gRPC::grpc
|
||||
PROPERTIES IMPORTED_LOCATION_RELEASE
|
||||
"${_gRPC_grpc_LIBRARY_RELEASE}")
|
||||
set_target_properties(
|
||||
gRPC::grpc PROPERTIES IMPORTED_LOCATION_RELEASE
|
||||
"${_gRPC_grpc_LIBRARY_RELEASE}")
|
||||
endif ()
|
||||
if (EXISTS "${_gRPC_grpc_LIBRARY_DEBUG}")
|
||||
set_property(TARGET gRPC::grpc
|
||||
APPEND
|
||||
set_property(TARGET gRPC::grpc APPEND
|
||||
PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
|
||||
set_target_properties(gRPC::grpc
|
||||
PROPERTIES IMPORTED_LOCATION_DEBUG
|
||||
"${_gRPC_grpc_LIBRARY_DEBUG}")
|
||||
set_target_properties(
|
||||
gRPC::grpc PROPERTIES IMPORTED_LOCATION_DEBUG
|
||||
"${_gRPC_grpc_LIBRARY_DEBUG}")
|
||||
endif ()
|
||||
set_property(TARGET gRPC::grpc
|
||||
APPEND
|
||||
PROPERTY INTERFACE_LINK_LIBRARIES protobuf::libprotobuf
|
||||
Threads::Threads)
|
||||
set_property(
|
||||
TARGET gRPC::grpc APPEND
|
||||
PROPERTY INTERFACE_LINK_LIBRARIES protobuf::libprotobuf
|
||||
Threads::Threads)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if (_gRPC_grpc++_LIBRARY)
|
||||
if (NOT TARGET gRPC::grpc++)
|
||||
add_library(gRPC::grpc++ IMPORTED UNKNOWN)
|
||||
set_target_properties(gRPC::grpc++
|
||||
PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
|
||||
"${_gRPC++_INCLUDE_DIR}")
|
||||
set_target_properties(
|
||||
gRPC::grpc++ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
|
||||
"${_gRPC++_INCLUDE_DIR}")
|
||||
if (EXISTS "${_gRPC_grpc++_LIBRARY}")
|
||||
set_target_properties(gRPC::grpc++
|
||||
PROPERTIES IMPORTED_LOCATION
|
||||
"${_gRPC_grpc++_LIBRARY}")
|
||||
set_target_properties(
|
||||
gRPC::grpc++ PROPERTIES IMPORTED_LOCATION
|
||||
"${_gRPC_grpc++_LIBRARY}")
|
||||
endif ()
|
||||
if (EXISTS "${_gRPC_grpc++_LIBRARY_RELEASE}")
|
||||
set_property(TARGET gRPC::grpc++
|
||||
APPEND
|
||||
set_property(TARGET gRPC::grpc++ APPEND
|
||||
PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(gRPC::grpc++
|
||||
PROPERTIES IMPORTED_LOCATION_RELEASE
|
||||
"${_gRPC_grpc++_LIBRARY_RELEASE}")
|
||||
set_target_properties(
|
||||
gRPC::grpc++ PROPERTIES IMPORTED_LOCATION_RELEASE
|
||||
"${_gRPC_grpc++_LIBRARY_RELEASE}")
|
||||
endif ()
|
||||
if (EXISTS "${_gRPC_grpc++_LIBRARY_DEBUG}")
|
||||
set_property(TARGET gRPC::grpc++
|
||||
APPEND
|
||||
set_property(TARGET gRPC::grpc++ APPEND
|
||||
PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
|
||||
set_target_properties(gRPC::grpc++
|
||||
PROPERTIES IMPORTED_LOCATION_DEBUG
|
||||
"${_gRPC_grpc++_LIBRARY_DEBUG}")
|
||||
set_target_properties(
|
||||
gRPC::grpc++ PROPERTIES IMPORTED_LOCATION_DEBUG
|
||||
"${_gRPC_grpc++_LIBRARY_DEBUG}")
|
||||
endif ()
|
||||
set_property(TARGET gRPC::grpc++
|
||||
APPEND
|
||||
PROPERTY INTERFACE_LINK_LIBRARIES
|
||||
gRPC::grpc
|
||||
protobuf::libprotobuf
|
||||
Threads::Threads)
|
||||
set_property(
|
||||
TARGET gRPC::grpc++ APPEND
|
||||
PROPERTY INTERFACE_LINK_LIBRARIES gRPC::grpc protobuf::libprotobuf
|
||||
Threads::Threads)
|
||||
if (CMAKE_VERSION VERSION_GREATER 3.8)
|
||||
# gRPC++ requires C++11, but only CMake-3.8 introduced a target
|
||||
# compiler feature to meet that requirement.
|
||||
set_property(TARGET gRPC::grpc++
|
||||
APPEND
|
||||
set_property(TARGET gRPC::grpc++ APPEND
|
||||
PROPERTY INTERFACE_COMPILE_FEATURES cxx_std_11)
|
||||
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||
# CMake 3.5 is still alive and kicking in some older distros, use
|
||||
# the compiler-specific versions in these cases.
|
||||
set_property(TARGET gRPC::grpc++
|
||||
APPEND
|
||||
set_property(TARGET gRPC::grpc++ APPEND
|
||||
PROPERTY INTERFACE_COMPILE_OPTIONS "-std=c++11")
|
||||
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
set_property(TARGET gRPC::grpc++
|
||||
APPEND
|
||||
set_property(TARGET gRPC::grpc++ APPEND
|
||||
PROPERTY INTERFACE_COMPILE_OPTIONS "-std=c++11")
|
||||
else ()
|
||||
message(
|
||||
|
|
@ -294,7 +284,9 @@ if (_gRPC_USE_STATIC_LIBS)
|
|||
set(CMAKE_FIND_LIBRARY_PREFIXES "${_gRPC_ORIG_FIND_LIBRARY_PREFIXES}")
|
||||
endif ()
|
||||
|
||||
file(WRITE "${CMAKE_BINARY_DIR}/get_gRPC_version.cc" [====[
|
||||
file(
|
||||
WRITE "${CMAKE_BINARY_DIR}/get_gRPC_version.cc"
|
||||
[====[
|
||||
#include <grpcpp/grpcpp.h>
|
||||
#include <iostream>
|
||||
int main() {
|
||||
|
|
@ -303,30 +295,32 @@ int main() {
|
|||
}
|
||||
]====])
|
||||
|
||||
try_run(_gRPC_GET_VERSION_STATUS
|
||||
_gRPC_GET_VERSION_COMPILE_STATUS
|
||||
"${CMAKE_BINARY_DIR}"
|
||||
"${CMAKE_BINARY_DIR}/get_gRPC_version.cc"
|
||||
LINK_LIBRARIES
|
||||
gRPC::grpc++
|
||||
gRPC::grpc
|
||||
COMPILE_OUTPUT_VARIABLE _gRPC_GET_VERSION_COMPILE_OUTPUT
|
||||
RUN_OUTPUT_VARIABLE gRPC_VERSION)
|
||||
try_run(
|
||||
_gRPC_GET_VERSION_STATUS
|
||||
_gRPC_GET_VERSION_COMPILE_STATUS
|
||||
"${CMAKE_BINARY_DIR}"
|
||||
"${CMAKE_BINARY_DIR}/get_gRPC_version.cc"
|
||||
LINK_LIBRARIES
|
||||
gRPC::grpc++
|
||||
gRPC::grpc
|
||||
COMPILE_OUTPUT_VARIABLE _gRPC_GET_VERSION_COMPILE_OUTPUT
|
||||
RUN_OUTPUT_VARIABLE gRPC_VERSION)
|
||||
|
||||
file(REMOVE "${CMAKE_BINARY_DIR}/get_gRPC_version.cc")
|
||||
|
||||
_grpc_fix_grpc_cpp_plugin_target()
|
||||
|
||||
if (gRPC_DEBUG)
|
||||
foreach (_var
|
||||
_gRPC_CPP_PLUGIN_EXECUTABLE
|
||||
_gRPC_VERSION_RAW
|
||||
_gRPC_GET_VERSION_STATUS
|
||||
_gRPC_GET_VERSION_COMPILE_STATUS
|
||||
_gRPC_GET_VERSION_COMPILE_OUTPUT
|
||||
_gRPC_grpc_LIBRARY
|
||||
_gRPC_grpc++_LIBRARY
|
||||
_gRPC_INCLUDE_DIR)
|
||||
foreach (
|
||||
_var
|
||||
_gRPC_CPP_PLUGIN_EXECUTABLE
|
||||
_gRPC_VERSION_RAW
|
||||
_gRPC_GET_VERSION_STATUS
|
||||
_gRPC_GET_VERSION_COMPILE_STATUS
|
||||
_gRPC_GET_VERSION_COMPILE_OUTPUT
|
||||
_gRPC_grpc_LIBRARY
|
||||
_gRPC_grpc++_LIBRARY
|
||||
_gRPC_INCLUDE_DIR)
|
||||
message(
|
||||
STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
|
||||
"${_var} = ${${_var}}")
|
||||
|
|
@ -335,9 +329,5 @@ if (gRPC_DEBUG)
|
|||
endif ()
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(gRPC
|
||||
REQUIRED_VARS
|
||||
_gRPC_grpc_LIBRARY
|
||||
_gRPC_INCLUDE_DIR
|
||||
VERSION_VAR
|
||||
gRPC_VERSION)
|
||||
find_package_handle_standard_args(gRPC REQUIRED_VARS _gRPC_grpc_LIBRARY
|
||||
_gRPC_INCLUDE_DIR VERSION_VAR gRPC_VERSION)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue