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,58 @@
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(LOCAL_OPTIONS
-DBUILD_STATIC_LIBS=OFF
)
else()
message("Static building is only possible when compiling static and dynamic versions at the same time. Enabling both.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO opentracing/opentracing-cpp
REF 4bb431f7728eaf383a07e86f9754a5b67575dab0 # v1.6.0
SHA512 1c69ff4cfd5f6037a48815367d3026c1bf06c3c49ebf232a64c43167385fb62e444c3b3224fc38f68ef0fdb378e3736db6ee6ba57160e6e578c87c09e92e527e
PATCHES
repair_mojibake.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DENABLE_LINTING=OFF
-DBUILD_TESTING=OFF
${LOCAL_OPTIONS}
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenTracing)
vcpkg_copy_pdbs()
# Move DLLs to /bin
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/opentracing.dll ${CURRENT_PACKAGES_DIR}/bin/opentracing.dll)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/opentracing.dll ${CURRENT_PACKAGES_DIR}/debug/bin/opentracing.dll)
# Fix targets
file(READ ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-release.cmake RELEASE_CONFIG)
string(REPLACE "\${_IMPORT_PREFIX}/lib/opentracing.dll"
"\${_IMPORT_PREFIX}/bin/opentracing.dll" RELEASE_CONFIG ${RELEASE_CONFIG})
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-release.cmake "${RELEASE_CONFIG}")
file(READ ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-debug.cmake DEBUG_CONFIG)
string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/opentracing.dll"
"\${_IMPORT_PREFIX}/debug/bin/opentracing.dll" DEBUG_CONFIG ${DEBUG_CONFIG})
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-debug.cmake "${DEBUG_CONFIG}")
endif()
endif()
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
# Remove duplicate headers
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

View File

@@ -0,0 +1,59 @@
From 31c92781ac953cb83963cfe5ac30324579fa7b2d Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Fri, 18 Dec 2020 10:07:02 -0800
Subject: [PATCH] Repair mojibake in expected.hpp
The affected characters herein triggered warnings
C:\Dev\vcpkg\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\3rd_party\include\opentracing/expected/expected.hpp(1): warning C4828: The file contains a character starting at offset 0x4a77 that is illegal in the current source character set (codepage 65001).
---
3rd_party/include/opentracing/expected/expected.hpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/3rd_party/include/opentracing/expected/expected.hpp b/3rd_party/include/opentracing/expected/expected.hpp
index 8283a77..0d21d43 100644
--- a/3rd_party/include/opentracing/expected/expected.hpp
+++ b/3rd_party/include/opentracing/expected/expected.hpp
@@ -778,13 +778,13 @@ class expected
// expected<decltype(func(declval<T>())),E> map(F&& func) ;
// template <typename F>
-// <20>see below<6F> bind(F&& func);
+// 'see below' bind(F&& func);
// template <typename F>
// expected<T,E> catch_error(F&& f);
// template <typename F>
-// <20>see below<6F> then(F&& func);
+// 'see below' then(F&& func);
private:
bool has_value_;
@@ -955,9 +955,9 @@ class expected<void, E>
return ! has_value() && std::is_base_of< Ex, decltype( get_unexpected().value() ) >::value;
}
-// template constexpr <20>see below<6F> unwrap() const&;
+// template constexpr 'see below' unwrap() const&;
//
-// template <20>see below<6F> unwrap() &&;
+// template 'see below' unwrap() &&;
// factories
@@ -968,13 +968,13 @@ class expected<void, E>
// expected<decltype(func()), E> map(F&& func) ;
//
// template <typename F>
-// <20>see below<6F> bind(F&& func) ;
+// 'see below' bind(F&& func) ;
//
// template <typename F>
// expected<void,E> catch_error(F&& f);
//
// template <typename F>
-// <20>see below<6F> then(F&& func);
+// 'see below' then(F&& func);
private:
bool has_value_;

19
externals/vcpkg/ports/opentracing/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,19 @@
{
"name": "opentracing",
"version": "1.6.0",
"port-version": 3,
"description": "C++ implementation of the OpenTracing API",
"homepage": "https://opentracing.io",
"license": "Apache-2.0",
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}