early-access version 2853
This commit is contained in:
26
externals/vcpkg/ports/rsocket/fix-cmake-config.patch
vendored
Executable file
26
externals/vcpkg/ports/rsocket/fix-cmake-config.patch
vendored
Executable file
@@ -0,0 +1,26 @@
|
||||
diff --git a/cmake/rsocket-config.cmake.in b/cmake/rsocket-config.cmake.in
|
||||
index d5579a85..ea12752a 100644
|
||||
--- a/cmake/rsocket-config.cmake.in
|
||||
+++ b/cmake/rsocket-config.cmake.in
|
||||
@@ -4,7 +4,7 @@
|
||||
@PACKAGE_INIT@
|
||||
|
||||
if(NOT TARGET rsocket::ReactiveSocket)
|
||||
- include("${PACKAGE_PREFIX_DIR}/lib/cmake/rsocket/rsocket-exports.cmake")
|
||||
+ include("${CMAKE_CURRENT_LIST_DIR}/rsocket-exports.cmake")
|
||||
endif()
|
||||
|
||||
if (NOT rsocket_FIND_QUIETLY)
|
||||
diff --git a/yarpl/cmake/yarpl-config.cmake.in b/yarpl/cmake/yarpl-config.cmake.in
|
||||
index d557b213..1b83fffc 100644
|
||||
--- a/yarpl/cmake/yarpl-config.cmake.in
|
||||
+++ b/yarpl/cmake/yarpl-config.cmake.in
|
||||
@@ -4,7 +4,7 @@
|
||||
@PACKAGE_INIT@
|
||||
|
||||
if(NOT TARGET yarpl::yarpl)
|
||||
- include("${PACKAGE_PREFIX_DIR}/lib/cmake/yarpl/yarpl-exports.cmake")
|
||||
+ include("${CMAKE_CURRENT_LIST_DIR}/yarpl-exports.cmake")
|
||||
endif()
|
||||
|
||||
set(YARPL_LIBRARIES yarpl::yarpl)
|
||||
94
externals/vcpkg/ports/rsocket/fix-find-dependencies.patch
vendored
Executable file
94
externals/vcpkg/ports/rsocket/fix-find-dependencies.patch
vendored
Executable file
@@ -0,0 +1,94 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f69e907..22570b5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -124,7 +124,7 @@ option(BUILD_BENCHMARKS "Build benchmarks" ON)
|
||||
option(BUILD_EXAMPLES "Build examples" ON)
|
||||
option(BUILD_TESTS "Build tests" ON)
|
||||
|
||||
-enable_testing()
|
||||
+#enable_testing()
|
||||
|
||||
include(ExternalProject)
|
||||
include(CTest)
|
||||
@@ -172,7 +172,9 @@ endif()
|
||||
|
||||
if("${BUILD_TYPE_LOWER}" MATCHES "debug")
|
||||
message("debug mode was set")
|
||||
+ if (NOT WIN32)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unreachable-code")
|
||||
+ endif()
|
||||
else()
|
||||
message("release mode was set")
|
||||
endif()
|
||||
@@ -181,18 +183,25 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
||||
set(TEST_CXX_FLAGS ${TEST_CXX_FLAGS} -Wno-inconsistent-missing-override)
|
||||
endif()
|
||||
|
||||
-find_library(DOUBLE-CONVERSION double-conversion)
|
||||
+find_package(double-conversion CONFIG REQUIRED)
|
||||
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
-find_package(Gflags REQUIRED)
|
||||
+find_package(gflags CONFIG REQUIRED)
|
||||
|
||||
-# find glog::glog to satisfy the folly dep.
|
||||
-find_package(Glog REQUIRED)
|
||||
+find_package(ZLIB REQUIRED)
|
||||
|
||||
-find_package(fmt CONFIG REQUIRED)
|
||||
+if (BUILD_SHARED_LIBS)
|
||||
+ set(gflags gflags_shared)
|
||||
+else()
|
||||
+ set(gflags gflags_static)
|
||||
+endif()
|
||||
|
||||
-include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
|
||||
+# find glog::glog to satisfy the folly dep.
|
||||
+find_package(folly CONFIG REQUIRED)
|
||||
+#find_package(glog CONFIG REQUIRED)
|
||||
+#
|
||||
+#find_package(fmt CONFIG REQUIRED)
|
||||
|
||||
include_directories(SYSTEM ${GFLAGS_INCLUDE_DIR})
|
||||
|
||||
@@ -327,7 +336,7 @@ target_compile_options(
|
||||
ReactiveSocket
|
||||
PRIVATE ${EXTRA_CXX_FLAGS})
|
||||
|
||||
-enable_testing()
|
||||
+#enable_testing()
|
||||
|
||||
install(TARGETS ReactiveSocket EXPORT rsocket-exports DESTINATION lib)
|
||||
install(DIRECTORY rsocket DESTINATION include FILES_MATCHING PATTERN "*.h")
|
||||
@@ -470,7 +479,7 @@ if(BUILD_TESTS)
|
||||
${GMOCK_LIBS} # This also needs the preceding `add_dependencies`
|
||||
glog::glog
|
||||
gflags
|
||||
- ${DOUBLE-CONVERSION})
|
||||
+ double-conversion::double-conversion)
|
||||
|
||||
# Download the latest TCK drivers JAR.
|
||||
set(TCK_DRIVERS_JAR rsocket-tck-drivers-0.9.10.jar)
|
||||
diff --git a/yarpl/CMakeLists.txt b/yarpl/CMakeLists.txt
|
||||
index f4159b8..8c01ffb 100644
|
||||
--- a/yarpl/CMakeLists.txt
|
||||
+++ b/yarpl/CMakeLists.txt
|
||||
@@ -53,8 +53,14 @@ endif()
|
||||
# Using NDEBUG in Release builds.
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
|
||||
|
||||
-find_package(Gflags REQUIRED)
|
||||
-find_package(Glog REQUIRED)
|
||||
+find_package(gflags CONFIG REQUIRED)
|
||||
+if (BUILD_SHARED_LIBS)
|
||||
+ set(gflags gflags_shared)
|
||||
+else()
|
||||
+ set(gflags gflags_static)
|
||||
+endif()
|
||||
+
|
||||
+find_package(glog CONFIG REQUIRED)
|
||||
find_package(fmt CONFIG REQUIRED)
|
||||
|
||||
IF(NOT FOLLY_VERSION)
|
||||
13
externals/vcpkg/ports/rsocket/fix-folly.patch
vendored
Executable file
13
externals/vcpkg/ports/rsocket/fix-folly.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/rsocket/transports/tcp/TcpConnectionAcceptor.cpp b/rsocket/transports/tcp/TcpConnectionAcceptor.cpp
|
||||
index 12ac289f..c37f621a 100644
|
||||
--- a/rsocket/transports/tcp/TcpConnectionAcceptor.cpp
|
||||
+++ b/rsocket/transports/tcp/TcpConnectionAcceptor.cpp
|
||||
@@ -31,7 +31,7 @@ class TcpConnectionAcceptor::SocketCallback
|
||||
|
||||
void connectionAccepted(
|
||||
folly::NetworkSocket fdNetworkSocket,
|
||||
- const folly::SocketAddress& address) noexcept override {
|
||||
+ const folly::SocketAddress& address, AcceptInfo info) noexcept override {
|
||||
int fd = fdNetworkSocket.toFd();
|
||||
|
||||
VLOG(2) << "Accepting TCP connection from " << address << " on FD " << fd;
|
||||
44
externals/vcpkg/ports/rsocket/portfile.cmake
vendored
Executable file
44
externals/vcpkg/ports/rsocket/portfile.cmake
vendored
Executable file
@@ -0,0 +1,44 @@
|
||||
# yarpl only support static build in Windows
|
||||
if (VCPKG_TARGET_IS_WINDOWS)
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
endif()
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO rsocket/rsocket-cpp
|
||||
REF 45ed594ebd6701f40795c31ec922d784ec7fc921
|
||||
SHA512 51871253524b93a9622fa0f562019605b6034e4089cd955810050b4d43ff020813d632ea1e91bcaca0a8659638908c51df6eb686ba4f6583d4c15c04d5dc35bd
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-cmake-config.patch
|
||||
fix-find-dependencies.patch
|
||||
use-cpp-17.patch
|
||||
fix-folly.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DBUILD_EXAMPLES=OFF
|
||||
-DBUILD_TESTS=OFF
|
||||
-DBUILD_BENCHMARKS=OFF
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_cmake_config_fixup(PACKAGE_NAME yarpl CONFIG_PATH lib/cmake/yarpl DO_NOT_DELETE_PARENT_CONFIG_PATH)
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/rsocket)
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/include/yarpl/perf"
|
||||
"${CURRENT_PACKAGES_DIR}/include/yarpl/cmake"
|
||||
"${CURRENT_PACKAGES_DIR}/include/yarpl/test"
|
||||
"${CURRENT_PACKAGES_DIR}/include/rsocket/examples"
|
||||
"${CURRENT_PACKAGES_DIR}/include/rsocket/test"
|
||||
)
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
13
externals/vcpkg/ports/rsocket/use-cpp-17.patch
vendored
Executable file
13
externals/vcpkg/ports/rsocket/use-cpp-17.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 22570b5..15a750b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -154,7 +154,7 @@ if(BUILD_TESTS)
|
||||
|
||||
endif()
|
||||
|
||||
-set(CMAKE_CXX_STANDARD 14)
|
||||
+set(CMAKE_CXX_STANDARD 17)
|
||||
|
||||
include(CheckCXXCompilerFlag)
|
||||
|
||||
30
externals/vcpkg/ports/rsocket/vcpkg.json
vendored
Executable file
30
externals/vcpkg/ports/rsocket/vcpkg.json
vendored
Executable file
@@ -0,0 +1,30 @@
|
||||
{
|
||||
"name": "rsocket",
|
||||
"version-string": "2021.08.30.00",
|
||||
"port-version": 1,
|
||||
"description": "C++ implementation of RSocket http://rsocket.io",
|
||||
"homepage": "https://github.com/rsocket/rsocket-cpp",
|
||||
"dependencies": [
|
||||
"boost-context",
|
||||
"boost-filesystem",
|
||||
"boost-program-options",
|
||||
"boost-regex",
|
||||
"boost-system",
|
||||
"boost-thread",
|
||||
"double-conversion",
|
||||
"fmt",
|
||||
"folly",
|
||||
"gflags",
|
||||
"glog",
|
||||
"openssl",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
"zlib"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user