early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,27 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,7 @@
cmake_minimum_required(VERSION 2.8.7)
set(CMAKE_MACOSX_RPATH 1)
include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
+include(${CMAKE_ROOT}/Modules/GenerateExportHeader.cmake)
###
@@ -153,6 +154,8 @@ IF (SELECT_TIMEOUT)
set_target_properties(${PROJECT} PROPERTIES COMPILE_DEFINITIONS "__TACOPIE_TIMEOUT=${SELECT_TIMEOUT}")
ENDIF(SELECT_TIMEOUT)
+generate_export_header(${PROJECT} EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/tacopie/utils/${PROJECT}_export.hpp)
+target_include_directories(${PROJECT} PUBLIC ${CMAKE_BINARY_DIR})
###
# install
@@ -164,6 +167,7 @@ install(DIRECTORY DESTINATION ${CMAKE_BINARY_DIR}/bin/)
install (DIRECTORY ${CMAKE_BINARY_DIR}/lib/ DESTINATION lib USE_SOURCE_PERMISSIONS)
install (DIRECTORY ${CMAKE_BINARY_DIR}/bin/ DESTINATION bin USE_SOURCE_PERMISSIONS)
install (DIRECTORY ${TACOPIE_INCLUDES}/ DESTINATION include USE_SOURCE_PERMISSIONS)
+install (FILES ${CMAKE_BINARY_DIR}/tacopie/utils/${PROJECT}_export.hpp DESTINATION include/tacopie/utils)
###

View File

@@ -0,0 +1,20 @@
--- a/includes/tacopie/utils/logger.hpp
+++ b/includes/tacopie/utils/logger.hpp
@@ -26,6 +26,8 @@
#include <mutex>
#include <string>
+#include <tacopie/utils/tacopie_export.hpp>
+
namespace tacopie {
//!
@@ -161,7 +163,7 @@ private:
//! variable containing the current logger
//! by default, not set (no logs)
//!
-extern std::unique_ptr<logger_iface> active_logger;
+extern TACOPIE_EXPORT std::unique_ptr<logger_iface> active_logger;
//!
//! debug logging

43
externals/vcpkg/ports/tacopie/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,43 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO cpp-redis/tacopie
REF 3.2.0
SHA512 079b294b537aaffe3bcf43a485c3be5b15f633c3f7c70140032d60cb010d35b76e76ef4ddd7596f6bfaf3f7edca7cb086c67552efffbf65846e725d7be54ce72
HEAD_REF master
PATCHES
${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch
${CMAKE_CURRENT_LIST_DIR}/fix-export.patch
)
if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
set(MSVC_RUNTIME_LIBRARY_CONFIG "/MD")
else()
set(MSVC_RUNTIME_LIBRARY_CONFIG "/MT")
endif()
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
# tacopie forcibly removes "/RTC1" in its cmake file. Because this is an ABI-sensitive flag, we need to re-add it in a form that won't be detected.
set(VCPKG_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG} -RTC1")
set(VCPKG_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG} -RTC1")
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG}
)
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

7
externals/vcpkg/ports/tacopie/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,7 @@
{
"name": "tacopie",
"version-string": "3.2.0",
"port-version": 3,
"description": "Tacopie is a TCP Client & Server C++11 library",
"homepage": "https://github.com/cpp-redis/tacopie"
}