зеркало из https://github.com/microsoft/vcpkg.git
[brpc] update to 1.9.0 (#38918)
Fixes https://github.com/microsoft/vcpkg/issues/38799 Update `brpc` to the latest version 1.9.0. No feature needs to be tested. Remove unnecessary patch file. - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~The "supports" clause reflects platforms that may be fixed by this new version.~ - [ ] ~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~ - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file.
This commit is contained in:
Родитель
d837c81098
Коммит
a03284c722
|
@ -1,14 +0,0 @@
|
||||||
diff --git a/src/brpc/policy/thrift_protocol.cpp b/src/brpc/policy/thrift_protocol.cpp
|
|
||||||
index 9871c01..269cfe1 100644
|
|
||||||
--- a/src/brpc/policy/thrift_protocol.cpp
|
|
||||||
+++ b/src/brpc/policy/thrift_protocol.cpp
|
|
||||||
@@ -45,8 +45,7 @@
|
|
||||||
#if defined(_THRIFT_STDCXX_H_)
|
|
||||||
# define THRIFT_STDCXX apache::thrift::stdcxx
|
|
||||||
#else
|
|
||||||
- # define THRIFT_STDCXX boost
|
|
||||||
- # include <boost/make_shared.hpp>
|
|
||||||
+ # define THRIFT_STDCXX std
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index f364cd13..f4add26d 100644
|
index b14fe17..ecce87c 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -66,7 +66,8 @@ endif()
|
@@ -68,7 +68,8 @@ endif()
|
||||||
|
|
||||||
if(WITH_THRIFT)
|
if(WITH_THRIFT)
|
||||||
set(THRIFT_CPP_FLAG "-DENABLE_THRIFT_FRAMED_PROTOCOL")
|
set(THRIFT_CPP_FLAG "-DENABLE_THRIFT_FRAMED_PROTOCOL")
|
||||||
- set(THRIFT_LIB "thrift")
|
- find_library(THRIFT_LIB NAMES thrift)
|
||||||
+ find_package(Thrift CONFIG REQUIRED)
|
+ find_package(Thrift CONFIG REQUIRED)
|
||||||
+ set(THRIFT_LIB "thrift::thrift")
|
+ set(THRIFT_LIB "thrift::thrift")
|
||||||
endif()
|
if (NOT THRIFT_LIB)
|
||||||
|
message(FATAL_ERROR "Fail to find Thrift")
|
||||||
set(WITH_RDMA_VAL "0")
|
endif()
|
||||||
@@ -150,11 +151,15 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
@@ -153,7 +154,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -20,6 +20,12 @@ index f364cd13..f4add26d 100644
|
||||||
+find_package(protobuf CONFIG REQUIRED)
|
+find_package(protobuf CONFIG REQUIRED)
|
||||||
+get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES)
|
+get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES)
|
||||||
+set(PROTOBUF_LIBRARIES protobuf::libprotobuf)
|
+set(PROTOBUF_LIBRARIES protobuf::libprotobuf)
|
||||||
|
if(Protobuf_VERSION GREATER 4.21)
|
||||||
|
# required by absl
|
||||||
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
@@ -199,9 +202,11 @@ else()
|
||||||
|
use_cxx11()
|
||||||
|
endif()
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
+find_package(ZLIB REQUIRED)
|
+find_package(ZLIB REQUIRED)
|
||||||
|
|
||||||
|
@ -30,7 +36,7 @@ index f364cd13..f4add26d 100644
|
||||||
if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB))
|
if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB))
|
||||||
message(FATAL_ERROR "Fail to find leveldb")
|
message(FATAL_ERROR "Fail to find leveldb")
|
||||||
endif()
|
endif()
|
||||||
@@ -169,8 +174,9 @@ if(WITH_SNAPPY)
|
@@ -216,8 +221,9 @@ if(WITH_SNAPPY)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_GLOG)
|
if(WITH_GLOG)
|
||||||
|
@ -42,7 +48,7 @@ index f364cd13..f4add26d 100644
|
||||||
if((NOT GLOG_INCLUDE_PATH) OR (NOT GLOG_LIB))
|
if((NOT GLOG_INCLUDE_PATH) OR (NOT GLOG_LIB))
|
||||||
message(FATAL_ERROR "Fail to find glog")
|
message(FATAL_ERROR "Fail to find glog")
|
||||||
endif()
|
endif()
|
||||||
@@ -197,7 +203,7 @@ if(WITH_RDMA)
|
@@ -244,7 +250,7 @@ if(WITH_RDMA)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -51,32 +57,29 @@ index f364cd13..f4add26d 100644
|
||||||
if(NOT PROTOC_LIB)
|
if(NOT PROTOC_LIB)
|
||||||
message(FATAL_ERROR "Fail to find protoc lib")
|
message(FATAL_ERROR "Fail to find protoc lib")
|
||||||
endif()
|
endif()
|
||||||
@@ -208,7 +214,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
@@ -259,7 +265,7 @@ else()
|
||||||
)
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
- find_package(OpenSSL)
|
||||||
|
+ find_package(OpenSSL REQUIRED)
|
||||||
|
include_directories(${OPENSSL_INCLUDE_DIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
-find_package(OpenSSL)
|
@@ -275,9 +281,10 @@ set(DYNAMIC_LIB
|
||||||
+find_package(OpenSSL REQUIRED)
|
|
||||||
|
|
||||||
include_directories(
|
|
||||||
${GFLAGS_INCLUDE_PATH}
|
|
||||||
@@ -223,11 +229,11 @@ set(DYNAMIC_LIB
|
|
||||||
${LEVELDB_LIB}
|
${LEVELDB_LIB}
|
||||||
${PROTOC_LIB}
|
${PROTOC_LIB}
|
||||||
${CMAKE_THREAD_LIBS_INIT}
|
${CMAKE_THREAD_LIBS_INIT}
|
||||||
- ${THRIFT_LIB}
|
|
||||||
- ${THRIFTNB_LIB}
|
|
||||||
${OPENSSL_CRYPTO_LIBRARY}
|
|
||||||
+ ${OPENSSL_SSL_LIBRARY}
|
+ ${OPENSSL_SSL_LIBRARY}
|
||||||
+ ${THRIFT_LIB}
|
${THRIFT_LIB}
|
||||||
dl
|
dl
|
||||||
- z)
|
- z)
|
||||||
+ ZLIB::ZLIB)
|
+ ZLIB::ZLIB)
|
||||||
|
|
||||||
if(WITH_MESALINK)
|
if(WITH_BORINGSSL)
|
||||||
list(APPEND DYNAMIC_LIB ${MESALINK_LIB})
|
list(APPEND DYNAMIC_LIB ${BORINGSSL_SSL_LIBRARY})
|
||||||
diff --git a/cmake/FindGFLAGS.cmake b/cmake/FindGFLAGS.cmake
|
diff --git a/cmake/FindGFLAGS.cmake b/cmake/FindGFLAGS.cmake
|
||||||
index dfad5fd8..8423d55a 100644
|
index dfad5fd..8423d55 100644
|
||||||
--- a/cmake/FindGFLAGS.cmake
|
--- a/cmake/FindGFLAGS.cmake
|
||||||
+++ b/cmake/FindGFLAGS.cmake
|
+++ b/cmake/FindGFLAGS.cmake
|
||||||
@@ -24,7 +24,9 @@ if (GFLAGS_STATIC)
|
@@ -24,7 +24,9 @@ if (GFLAGS_STATIC)
|
||||||
|
@ -91,10 +94,10 @@ index dfad5fd8..8423d55a 100644
|
||||||
set(GFLAGS_FOUND TRUE)
|
set(GFLAGS_FOUND TRUE)
|
||||||
endif(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY)
|
endif(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY)
|
||||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||||
index fbcc7cc5..868270ea 100644
|
index 1b4b233..8e836a4 100644
|
||||||
--- a/src/CMakeLists.txt
|
--- a/src/CMakeLists.txt
|
||||||
+++ b/src/CMakeLists.txt
|
+++ b/src/CMakeLists.txt
|
||||||
@@ -31,16 +31,24 @@ add_dependencies(SOURCES_LIB PROTO_LIB)
|
@@ -31,6 +31,7 @@ add_dependencies(SOURCES_LIB PROTO_LIB)
|
||||||
set_property(TARGET ${SOURCES_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
set_property(TARGET ${SOURCES_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
||||||
set_property(TARGET ${BUTIL_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
set_property(TARGET ${BUTIL_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
||||||
|
|
||||||
|
@ -102,26 +105,29 @@ index fbcc7cc5..868270ea 100644
|
||||||
add_library(brpc-static STATIC $<TARGET_OBJECTS:BUTIL_LIB>
|
add_library(brpc-static STATIC $<TARGET_OBJECTS:BUTIL_LIB>
|
||||||
$<TARGET_OBJECTS:SOURCES_LIB>
|
$<TARGET_OBJECTS:SOURCES_LIB>
|
||||||
$<TARGET_OBJECTS:PROTO_LIB>)
|
$<TARGET_OBJECTS:PROTO_LIB>)
|
||||||
|
@@ -60,12 +61,19 @@ endfunction()
|
||||||
|
|
||||||
-if(BRPC_WITH_THRIFT)
|
|
||||||
- target_link_libraries(brpc-static thrift)
|
if(WITH_THRIFT)
|
||||||
+if(WITH_THRIFT)
|
- target_link_libraries(brpc-static ${THRIFT_LIB})
|
||||||
+ target_link_libraries(brpc-static ${THRIFT_LIB})
|
- check_thrift_version(brpc-static)
|
||||||
|
+ target_link_libraries(brpc-static PUBLIC ${THRIFT_LIB})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
+target_link_libraries(brpc-static PUBLIC ${DYNAMIC_LIB})
|
+target_link_libraries(brpc-static PUBLIC ${DYNAMIC_LIB})
|
||||||
+if(BRPC_WITH_GLOG)
|
+if(BRPC_WITH_GLOG)
|
||||||
+ target_link_libraries(brpc-static ${GLOG_LIB})
|
+ target_link_libraries(brpc-static PUBLIC ${GLOG_LIB})
|
||||||
+endif()
|
+endif()
|
||||||
+target_include_directories(brpc-static PUBLIC $<INSTALL_INTERFACE:include>)
|
+target_include_directories(brpc-static PUBLIC $<INSTALL_INTERFACE:include>)
|
||||||
|
+
|
||||||
SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1)
|
SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1)
|
||||||
|
|
||||||
+endif()
|
+endif()
|
||||||
|
|
||||||
+if(0)
|
+if(0)
|
||||||
# for protoc-gen-mcpack
|
# for protoc-gen-mcpack
|
||||||
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/output/bin)
|
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/output/bin)
|
||||||
|
|
||||||
@@ -49,35 +57,63 @@ set(protoc_gen_mcpack_SOURCES
|
@@ -74,36 +82,64 @@ set(protoc_gen_mcpack_SOURCES
|
||||||
)
|
)
|
||||||
|
|
||||||
add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES})
|
add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES})
|
||||||
|
@ -131,23 +137,26 @@ index fbcc7cc5..868270ea 100644
|
||||||
add_library(brpc-shared SHARED $<TARGET_OBJECTS:BUTIL_LIB>
|
add_library(brpc-shared SHARED $<TARGET_OBJECTS:BUTIL_LIB>
|
||||||
$<TARGET_OBJECTS:SOURCES_LIB>
|
$<TARGET_OBJECTS:SOURCES_LIB>
|
||||||
$<TARGET_OBJECTS:PROTO_LIB>)
|
$<TARGET_OBJECTS:PROTO_LIB>)
|
||||||
target_link_libraries(brpc-shared ${DYNAMIC_LIB})
|
- target_link_libraries(brpc-shared ${DYNAMIC_LIB})
|
||||||
|
+ target_link_libraries(brpc-shared PUBLIC ${DYNAMIC_LIB})
|
||||||
+ target_include_directories(brpc-shared PUBLIC $<INSTALL_INTERFACE:include>)
|
+ target_include_directories(brpc-shared PUBLIC $<INSTALL_INTERFACE:include>)
|
||||||
if(BRPC_WITH_GLOG)
|
if(WITH_GLOG)
|
||||||
target_link_libraries(brpc-shared ${GLOG_LIB})
|
- target_link_libraries(brpc-shared ${GLOG_LIB})
|
||||||
|
+ target_link_libraries(brpc-shared PUBLIC ${GLOG_LIB})
|
||||||
endif()
|
endif()
|
||||||
- if(BRPC_WITH_THRIFT)
|
if(WITH_THRIFT)
|
||||||
- target_link_libraries(brpc-shared thrift)
|
- target_link_libraries(brpc-shared ${THRIFT_LIB})
|
||||||
+ if(WITH_THRIFT)
|
- check_thrift_version(brpc-shared)
|
||||||
+ target_link_libraries(brpc-shared ${THRIFT_LIB})
|
+ target_link_libraries(brpc-shared PUBLIC ${THRIFT_LIB})
|
||||||
endif()
|
endif()
|
||||||
SET_TARGET_PROPERTIES(brpc-shared PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1)
|
SET_TARGET_PROPERTIES(brpc-shared PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1)
|
||||||
-
|
-
|
||||||
|
+
|
||||||
+ if(0)
|
+ if(0)
|
||||||
target_link_libraries(protoc-gen-mcpack brpc-shared ${DYNAMIC_LIB} pthread)
|
target_link_libraries(protoc-gen-mcpack brpc-shared ${DYNAMIC_LIB} pthread)
|
||||||
-
|
|
||||||
- install(TARGETS brpc-shared
|
|
||||||
+ endif()
|
+ endif()
|
||||||
|
|
||||||
|
- install(TARGETS brpc-shared
|
||||||
+ install(TARGETS brpc-shared EXPORT unofficial-brpcTargets
|
+ install(TARGETS brpc-shared EXPORT unofficial-brpcTargets
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
|
@ -160,7 +169,7 @@ index fbcc7cc5..868270ea 100644
|
||||||
+endif()
|
+endif()
|
||||||
|
|
||||||
|
|
||||||
|
-
|
||||||
-install(TARGETS brpc-static
|
-install(TARGETS brpc-static
|
||||||
+if(NOT BUILD_SHARED_LIBS)
|
+if(NOT BUILD_SHARED_LIBS)
|
||||||
+install(TARGETS brpc-static EXPORT unofficial-brpcTargets
|
+install(TARGETS brpc-static EXPORT unofficial-brpcTargets
|
||||||
|
|
|
@ -1,12 +1,11 @@
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index f4add26d..b87e8455 100644
|
index ecce87c..3d938d3 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -80,9 +80,10 @@ include(GNUInstallDirs)
|
@@ -86,8 +86,10 @@ configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_SOURCE_DIR}/src/butil
|
||||||
configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_SOURCE_DIR}/src/butil/config.h @ONLY)
|
|
||||||
|
|
||||||
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
|
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
|
||||||
-
|
|
||||||
-find_package(GFLAGS REQUIRED)
|
-find_package(GFLAGS REQUIRED)
|
||||||
-
|
-
|
||||||
+set(GFLAGS_USE_TARGET_NAMESPACE ON)
|
+set(GFLAGS_USE_TARGET_NAMESPACE ON)
|
||||||
|
@ -16,7 +15,7 @@ index f4add26d..b87e8455 100644
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND bash -c "grep \"namespace [_A-Za-z0-9]\\+ {\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $2}' | tr -d '\n'"
|
COMMAND bash -c "grep \"namespace [_A-Za-z0-9]\\+ {\" ${GFLAGS_INCLUDE_PATH}/gflags/gflags_declare.h | head -1 | awk '{print $2}' | tr -d '\n'"
|
||||||
OUTPUT_VARIABLE GFLAGS_NS
|
OUTPUT_VARIABLE GFLAGS_NS
|
||||||
@@ -93,6 +94,8 @@ if(${GFLAGS_NS} STREQUAL "GFLAGS_NAMESPACE")
|
@@ -98,6 +100,8 @@ if(${GFLAGS_NS} STREQUAL "GFLAGS_NAMESPACE")
|
||||||
OUTPUT_VARIABLE GFLAGS_NS
|
OUTPUT_VARIABLE GFLAGS_NS
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
@ -25,7 +24,7 @@ index f4add26d..b87e8455 100644
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
${PROJECT_SOURCE_DIR}/src
|
${PROJECT_SOURCE_DIR}/src
|
||||||
@@ -122,21 +125,21 @@ set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${DEBUG_SYMBOL} ${THRIFT_CPP_FLAG}")
|
@@ -127,19 +131,19 @@ set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${DEBUG_SYMBOL} ${THRIFT_CPP_FLAG}")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer")
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_CPP_FLAGS} -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-unused-parameter -fno-omit-frame-pointer")
|
set(CMAKE_C_FLAGS "${CMAKE_CPP_FLAGS} -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-unused-parameter -fno-omit-frame-pointer")
|
||||||
|
|
||||||
|
@ -48,43 +47,51 @@ index f4add26d..b87e8455 100644
|
||||||
-endmacro(use_cxx11)
|
-endmacro(use_cxx11)
|
||||||
+endmacro(use_cxx14)
|
+endmacro(use_cxx14)
|
||||||
|
|
||||||
-use_cxx11()
|
|
||||||
+use_cxx14()
|
|
||||||
|
|
||||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||||
#required by butil/crc32.cc to boost performance for 10x
|
#required by butil/crc32.cc to boost performance for 10x
|
||||||
|
@@ -199,7 +203,7 @@ if(Protobuf_VERSION GREATER 4.21)
|
||||||
|
absl::variant
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
- use_cxx11()
|
||||||
|
+ use_cxx14()
|
||||||
|
endif()
|
||||||
|
find_package(Threads REQUIRED)
|
||||||
|
find_package(ZLIB REQUIRED)
|
||||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||||
index 868270ea..a70ad23f 100644
|
index 8e836a4..c1b1f36 100644
|
||||||
--- a/src/CMakeLists.txt
|
--- a/src/CMakeLists.txt
|
||||||
+++ b/src/CMakeLists.txt
|
+++ b/src/CMakeLists.txt
|
||||||
@@ -31,6 +31,10 @@ add_dependencies(SOURCES_LIB PROTO_LIB)
|
@@ -30,6 +30,10 @@ add_dependencies(SOURCES_LIB PROTO_LIB)
|
||||||
|
# shared library needs POSITION_INDEPENDENT_CODE
|
||||||
set_property(TARGET ${SOURCES_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
set_property(TARGET ${SOURCES_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
||||||
set_property(TARGET ${BUTIL_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
set_property(TARGET ${BUTIL_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
|
||||||
|
|
||||||
+if(BRPC_WITH_GLOG)
|
+if(BRPC_WITH_GLOG)
|
||||||
+ target_link_libraries(BUTIL_LIB PUBLIC ${GLOG_LIB})
|
+ target_link_libraries(BUTIL_LIB PUBLIC ${GLOG_LIB})
|
||||||
+ target_link_libraries(SOURCES_LIB PUBLIC ${GLOG_LIB})
|
+ target_link_libraries(SOURCES_LIB PUBLIC ${GLOG_LIB})
|
||||||
+endif()
|
+endif()
|
||||||
|
|
||||||
if(NOT BUILD_SHARED_LIBS)
|
if(NOT BUILD_SHARED_LIBS)
|
||||||
add_library(brpc-static STATIC $<TARGET_OBJECTS:BUTIL_LIB>
|
add_library(brpc-static STATIC $<TARGET_OBJECTS:BUTIL_LIB>
|
||||||
$<TARGET_OBJECTS:SOURCES_LIB>
|
@@ -65,9 +69,7 @@ if(WITH_THRIFT)
|
||||||
@@ -41,9 +45,6 @@ if(WITH_THRIFT)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(brpc-static PUBLIC ${DYNAMIC_LIB})
|
target_link_libraries(brpc-static PUBLIC ${DYNAMIC_LIB})
|
||||||
-if(BRPC_WITH_GLOG)
|
-if(BRPC_WITH_GLOG)
|
||||||
- target_link_libraries(brpc-static ${GLOG_LIB})
|
- target_link_libraries(brpc-static PUBLIC ${GLOG_LIB})
|
||||||
-endif()
|
-endif()
|
||||||
|
+
|
||||||
target_include_directories(brpc-static PUBLIC $<INSTALL_INTERFACE:include>)
|
target_include_directories(brpc-static PUBLIC $<INSTALL_INTERFACE:include>)
|
||||||
SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1)
|
|
||||||
|
|
||||||
@@ -65,9 +66,6 @@ if(BUILD_SHARED_LIBS)
|
SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1)
|
||||||
|
@@ -90,9 +92,7 @@ if(BUILD_SHARED_LIBS)
|
||||||
$<TARGET_OBJECTS:PROTO_LIB>)
|
$<TARGET_OBJECTS:PROTO_LIB>)
|
||||||
target_link_libraries(brpc-shared ${DYNAMIC_LIB})
|
target_link_libraries(brpc-shared PUBLIC ${DYNAMIC_LIB})
|
||||||
target_include_directories(brpc-shared PUBLIC $<INSTALL_INTERFACE:include>)
|
target_include_directories(brpc-shared PUBLIC $<INSTALL_INTERFACE:include>)
|
||||||
- if(BRPC_WITH_GLOG)
|
- if(WITH_GLOG)
|
||||||
- target_link_libraries(brpc-shared ${GLOG_LIB})
|
- target_link_libraries(brpc-shared PUBLIC ${GLOG_LIB})
|
||||||
- endif()
|
- endif()
|
||||||
|
+
|
||||||
if(WITH_THRIFT)
|
if(WITH_THRIFT)
|
||||||
target_link_libraries(brpc-shared ${THRIFT_LIB})
|
target_link_libraries(brpc-shared PUBLIC ${THRIFT_LIB})
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -1,12 +1,11 @@
|
||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO apache/incubator-brpc
|
REPO apache/brpc
|
||||||
REF "${VERSION}"
|
REF "${VERSION}"
|
||||||
SHA512 da0004b7b50cc48da018627c9361ae62b006bb7cd2af53a5cfa1601aab7ad31174d37778a42809bdf2e0f2021a860dcbb02e2c3c938eae6c02808267c3b85025
|
SHA512 a908c3cf63224d6fb98f1855aca75c3adf528c40da5180c6e298cc52ee9ccbef08809a81078333bdd6ac1a4af54448edac8dd4e0333e72e9dec2790454355e7a
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
fix-build.patch
|
fix-build.patch
|
||||||
fix-boost-ptr.patch
|
|
||||||
fix-glog.patch
|
fix-glog.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -28,6 +27,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/butil/third_party/superfast
|
||||||
|
|
||||||
vcpkg_copy_pdbs()
|
vcpkg_copy_pdbs()
|
||||||
|
|
||||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||||
|
|
||||||
vcpkg_fixup_pkgconfig()
|
vcpkg_fixup_pkgconfig()
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
{
|
{
|
||||||
"name": "brpc",
|
"name": "brpc",
|
||||||
"version": "1.6.1",
|
"version": "1.9.0",
|
||||||
"port-version": 3,
|
|
||||||
"description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.",
|
"description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.",
|
||||||
"homepage": "https://github.com/apache/incubator-brpc",
|
"homepage": "https://github.com/apache/brpc",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"supports": "!windows & !(arm & android)",
|
"supports": "!windows & !(arm & android)",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "5c492561a044534b4177cf14d9296c8a68431755",
|
||||||
|
"version": "1.9.0",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "4aa97cf4dfb7c0ff2537a3b0e324daa97940d2c5",
|
"git-tree": "4aa97cf4dfb7c0ff2537a3b0e324daa97940d2c5",
|
||||||
"version": "1.6.1",
|
"version": "1.6.1",
|
||||||
|
|
|
@ -1369,8 +1369,8 @@
|
||||||
"port-version": 1
|
"port-version": 1
|
||||||
},
|
},
|
||||||
"brpc": {
|
"brpc": {
|
||||||
"baseline": "1.6.1",
|
"baseline": "1.9.0",
|
||||||
"port-version": 3
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"brunocodutra-metal": {
|
"brunocodutra-metal": {
|
||||||
"baseline": "2.1.4",
|
"baseline": "2.1.4",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче