Dump drogon to v1.8.2 and trantor to v1.5.8 and c-ares to 1.18.1 (#1729)
* Dump drogon to v1.8.2 and trantor to v1.5.8 * Fix drogon patches checksum * Dump c-ares to 1.18.1 * Fix trantor * fix c-ares * fix c-ares again My apologies for my previous sloppiness: I pasted it straight from another branch (in my fork), but didn't get it right... * fix c-ares again again * fix trantor checksumpull/1734/head
TES286
2 years ago
committed by
GitHub
parent
314103059e
commit
208a04158c
9 changed files with 230 additions and 10 deletions
@ -0,0 +1,20 @@ |
||||
diff --git a/c-ares-config.cmake.in b/c-ares-config.cmake.in
|
||||
--- a/c-ares-config.cmake.in
|
||||
+++ b/c-ares-config.cmake.in
|
||||
@@ -8,12 +8,16 @@ include("${CMAKE_CURRENT_LIST_DIR}/c-ares-targets.cmake")
|
||||
set(c-ares_LIBRARY c-ares::cares)
|
||||
|
||||
if(@CARES_SHARED@)
|
||||
+ if(NOT TARGET c-ares::cares_shared)
|
||||
add_library(c-ares::cares_shared INTERFACE IMPORTED)
|
||||
set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares")
|
||||
+ endif()
|
||||
set(c-ares_SHARED_LIBRARY c-ares::cares_shared)
|
||||
elseif(@CARES_STATIC@)
|
||||
+ if(NOT TARGET c-ares::cares_static)
|
||||
add_library(c-ares::cares_static INTERFACE IMPORTED)
|
||||
set_target_properties(c-ares::cares_static PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares")
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
if(@CARES_STATIC@)
|
||||
@ -0,0 +1,12 @@ |
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -618,7 +618,7 @@ ADD_SUBDIRECTORY (include)
|
||||
ADD_SUBDIRECTORY (src)
|
||||
|
||||
# Docs
|
||||
-ADD_SUBDIRECTORY (docs)
|
||||
+#ADD_SUBDIRECTORY (docs)
|
||||
|
||||
# Tests
|
||||
IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS)
|
||||
@ -0,0 +1,12 @@ |
||||
diff --git a/cmake/templates/DrogonConfig.cmake.in b/cmake/templates/DrogonConfig.cmake.in
|
||||
--- a/cmake/templates/DrogonConfig.cmake.in
|
||||
+++ b/cmake/templates/DrogonConfig.cmake.in
|
||||
@@ -19,7 +19,7 @@ find_dependency(UUID REQUIRED)
|
||||
endif(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" AND NOT WIN32)
|
||||
find_dependency(ZLIB REQUIRED)
|
||||
if(@pg_FOUND@)
|
||||
-find_dependency(pg)
|
||||
+find_dependency(PostgreSQL)
|
||||
endif()
|
||||
if(@SQLite3_FOUND@)
|
||||
find_dependency(SQLite3)
|
||||
@ -0,0 +1,62 @@ |
||||
diff --git a/nosql_lib/redis/src/RedisClientImpl.cc b/nosql_lib/redis/src/RedisClientImpl.cc
|
||||
--- a/nosql_lib/redis/src/RedisClientImpl.cc
|
||||
+++ b/nosql_lib/redis/src/RedisClientImpl.cc
|
||||
@@ -12,6 +12,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#include "RedisConnection.h"
|
||||
#include "RedisClientImpl.h"
|
||||
#include "RedisTransactionImpl.h"
|
||||
#include "../../lib/src/TaskTimeoutFlag.h"
|
||||
diff --git a/nosql_lib/redis/src/RedisClientImpl.h b/nosql_lib/redis/src/RedisClientImpl.h
|
||||
--- a/nosql_lib/redis/src/RedisClientImpl.h
|
||||
+++ b/nosql_lib/redis/src/RedisClientImpl.h
|
||||
@@ -13,7 +13,6 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
-#include "RedisConnection.h"
|
||||
#include <drogon/nosql/RedisClient.h>
|
||||
#include <trantor/utils/NonCopyable.h>
|
||||
#include <trantor/net/EventLoopThreadPool.h>
|
||||
@@ -26,6 +25,8 @@ namespace drogon
|
||||
{
|
||||
namespace nosql
|
||||
{
|
||||
+class RedisConnection;
|
||||
+using RedisConnectionPtr = std::shared_ptr<RedisConnection>;
|
||||
class RedisClientImpl final
|
||||
: public RedisClient,
|
||||
public trantor::NonCopyable,
|
||||
diff --git a/nosql_lib/redis/src/RedisClientLockFree.cc b/nosql_lib/redis/src/RedisClientLockFree.cc
|
||||
--- a/nosql_lib/redis/src/RedisClientLockFree.cc
|
||||
+++ b/nosql_lib/redis/src/RedisClientLockFree.cc
|
||||
@@ -12,6 +12,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#include "RedisConnection.h"
|
||||
#include "RedisClientLockFree.h"
|
||||
#include "RedisTransactionImpl.h"
|
||||
#include "../../lib/src/TaskTimeoutFlag.h"
|
||||
diff --git a/nosql_lib/redis/src/RedisClientLockFree.h b/nosql_lib/redis/src/RedisClientLockFree.h
|
||||
--- a/nosql_lib/redis/src/RedisClientLockFree.h
|
||||
+++ b/nosql_lib/redis/src/RedisClientLockFree.h
|
||||
@@ -13,7 +13,6 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
-#include "RedisConnection.h"
|
||||
#include <drogon/nosql/RedisClient.h>
|
||||
#include <trantor/utils/NonCopyable.h>
|
||||
#include <trantor/net/EventLoopThreadPool.h>
|
||||
@@ -26,6 +25,8 @@ namespace drogon
|
||||
{
|
||||
namespace nosql
|
||||
{
|
||||
+class RedisConnection;
|
||||
+using RedisConnectionPtr = std::shared_ptr<RedisConnection>;
|
||||
class RedisClientLockFree final
|
||||
: public RedisClient,
|
||||
public trantor::NonCopyable,
|
||||
@ -0,0 +1,52 @@ |
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -120,9 +120,9 @@ if (WIN32)
|
||||
PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>)
|
||||
endif (WIN32)
|
||||
|
||||
-add_subdirectory(trantor)
|
||||
+find_package(Trantor CONFIG REQUIRED)
|
||||
|
||||
-target_link_libraries(${PROJECT_NAME} PUBLIC trantor)
|
||||
+target_link_libraries(${PROJECT_NAME} PUBLIC Trantor::Trantor)
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Haiku")
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE network)
|
||||
@@ -316,11 +316,10 @@ endif (NOT WIN32)
|
||||
|
||||
if (BUILD_POSTGRESQL)
|
||||
# find postgres
|
||||
- find_package(pg)
|
||||
- if (pg_FOUND)
|
||||
- message(STATUS "libpq inc path:" ${PG_INCLUDE_DIRS})
|
||||
- message(STATUS "libpq lib:" ${PG_LIBRARIES})
|
||||
- target_link_libraries(${PROJECT_NAME} PRIVATE pg_lib)
|
||||
+ find_package(PostgreSQL REQUIRED)
|
||||
+ if(PostgreSQL_FOUND)
|
||||
+ set(pg_FOUND true)
|
||||
+ target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL)
|
||||
set(DROGON_SOURCES
|
||||
${DROGON_SOURCES}
|
||||
orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc)
|
||||
@@ -348,7 +348,7 @@ if (BUILD_POSTGRESQL)
|
||||
${private_headers}
|
||||
orm_lib/src/postgresql_impl/PgConnection.h)
|
||||
endif (libpq_supports_batch)
|
||||
- endif (pg_FOUND)
|
||||
+ endif (PostgreSQL_FOUND)
|
||||
endif (BUILD_POSTGRESQL)
|
||||
|
||||
if (BUILD_MYSQL)
|
||||
diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt
|
||||
--- a/drogon_ctl/CMakeLists.txt
|
||||
+++ b/drogon_ctl/CMakeLists.txt
|
||||
@@ -19,7 +19,7 @@ add_executable(_drogon_ctl
|
||||
target_link_libraries(_drogon_ctl ${PROJECT_NAME})
|
||||
if (WIN32 AND BUILD_SHARED_LIBS)
|
||||
set(DROGON_FILE $<TARGET_FILE:drogon>)
|
||||
- set(TRANTOR_FILE $<TARGET_FILE:trantor>)
|
||||
+ set(TRANTOR_FILE $<TARGET_FILE:Trantor::Trantor>)
|
||||
add_custom_command(TARGET _drogon_ctl POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
-DCTL_FILE=${DROGON_FILE}
|
||||
@ -0,0 +1,40 @@ |
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -282,36 +282,3 @@ install(EXPORT TrantorTargets
|
||||
DESTINATION "${INSTALL_TRANTOR_CMAKE_DIR}"
|
||||
NAMESPACE Trantor::
|
||||
COMPONENT dev)
|
||||
-
|
||||
-# Doxygen documentation
|
||||
-find_package(Doxygen OPTIONAL_COMPONENTS dot dia)
|
||||
-if(DOXYGEN_FOUND)
|
||||
- set(DOXYGEN_PROJECT_BRIEF "Non-blocking I/O cross-platform TCP network library, using C++14")
|
||||
- set(DOXYGEN_OUTPUT_DIRECTORY docs/${PROJECT_NAME})
|
||||
- set(DOXYGEN_GENERATE_LATEX NO)
|
||||
- set(DOXYGEN_BUILTIN_STL_SUPPORT YES)
|
||||
- set(DOXYGEN_USE_MDFILE_AS_MAINPAGE README.md)
|
||||
- set(DOXYGEN_STRIP_FROM_INC_PATH ${PROJECT_SOURCE_DIR}
|
||||
- ${CMAKE_CURRENT_BINARY_DIR}/exports)
|
||||
- if (WIN32)
|
||||
- set(DOXYGEN_PREDEFINED _WIN32)
|
||||
- endif(WIN32)
|
||||
- doxygen_add_docs(doc_${PROJECT_NAME}
|
||||
- README.md
|
||||
- ChangeLog.md
|
||||
- ${public_net_headers}
|
||||
- ${public_utils_headers}
|
||||
- COMMENT "Generate documentation")
|
||||
- if(NOT TARGET doc)
|
||||
- add_custom_target(doc)
|
||||
- endif()
|
||||
- add_dependencies(doc doc_${PROJECT_NAME})
|
||||
- if (BUILD_DOC)
|
||||
- add_dependencies(${PROJECT_NAME} doc_${PROJECT_NAME})
|
||||
- # Don't install twice, so limit to Debug (assume developer)
|
||||
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docs/${PROJECT_NAME}
|
||||
- TYPE DOC
|
||||
- CONFIGURATIONS Debug)
|
||||
- endif(BUILD_DOC)
|
||||
-endif(DOXYGEN_FOUND)
|
||||
-
|
||||
Loading…
Reference in new issue