[telnetpp] Update port version 2.1.2 -> 3.1.0 (#36571)

Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com>
This commit is contained in:
Vitaly 2024-06-03 06:55:58 +02:00 committed by GitHub
parent 47364fbc30
commit 921f059d91
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 84 additions and 62 deletions

View File

@ -0,0 +1,45 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2dc81a3..4d53fa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -260,11 +260,11 @@ install(
EXPORT
telnetpp-targets
ARCHIVE DESTINATION
- ${CMAKE_INSTALL_LIBDIR}/telnetpp-${TELNETPP_VERSION}
+ lib
RUNTIME DESTINATION
- ${CMAKE_INSTALL_LIBDIR}/telnetpp-${TELNETPP_VERSION}
+ bin
LIBRARY DESTINATION
- ${CMAKE_INSTALL_BINDIR}/telnetpp-${TELNETPP_VERSION}
+ lib
)
install(
@@ -273,14 +273,14 @@ install(
NAMESPACE
KazDragon::
DESTINATION
- ${CMAKE_INSTALL_DATADIR}/telnetpp-${TELNETPP_VERSION}
+ share/telnetpp
)
install(
DIRECTORY
include/
DESTINATION
- ${CMAKE_INSTALL_INCLUDEDIR}/telnetpp-${TELNETPP_VERSION}
+ include
)
install(
@@ -288,7 +288,7 @@ install(
"${CMAKE_CURRENT_BINARY_DIR}/telnetpp-config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/telnetpp-config-version.cmake"
DESTINATION
- ${CMAKE_INSTALL_DATADIR}/telnetpp-${TELNETPP_VERSION}
+ share/telnetpp
)
if (TELNETPP_WITH_TESTS)

View File

@ -1,48 +0,0 @@
CMakeLists.txt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09722a9..7bf9952 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -277,18 +277,18 @@ install(
EXPORT
telnetpp-config
ARCHIVE DESTINATION
- lib/telnetpp-${TELNETPP_VERSION}
+ lib
RUNTIME DESTINATION
- lib/telnetpp-${TELNETPP_VERSION}
+ bin
LIBRARY DESTINATION
- lib/telnetpp-${TELNETPP_VERSION}
+ lib
)
install(
DIRECTORY
include/
DESTINATION
- include/telnetpp-${TELNETPP_VERSION}
+ include
)
export(
@@ -302,7 +302,7 @@ install(
EXPORT
telnetpp-config
DESTINATION
- lib/telnetpp-${TELNETPP_VERSION}
+ share/telnetpp
)
include(CMakePackageConfigHelpers)
@@ -317,7 +317,7 @@ install(
FILES
"${CMAKE_CURRENT_BINARY_DIR}/telnetpp-config-version.cmake"
DESTINATION
- lib/telnetpp-${TELNETPP_VERSION}
+ share/telnetpp
)
if (TELNETPP_WITH_TESTS)

View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d53fa6..c426e70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,7 +218,7 @@ target_compile_features(telnetpp
target_include_directories(telnetpp
PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
- $<INSTALL_INTERFACE:include/telnetpp-${TELNETPP_VERSION}>
+ $<INSTALL_INTERFACE:include>
)
generate_export_header(telnetpp

View File

@ -1,10 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KazDragon/telnetpp
REF f370ebd0c0dc6505708065ee5afdc59a6de54387 # v2.1.2 + MSVC patches
SHA512 c58cb9159a8fb6c4b089a0212a995f70f08b93877d98828aa263e9f065f42a932d98749b56741d9e711c0805dcc2dcf0607dc86b0553c4e34bd3fad99e0bf157
REF "v${VERSION}"
SHA512 be0a4304846369f85fef68c9b468b720877a640f8fb32496cf56591da4bb515b9afa9ac4c4477b2275049c304bd17c84b8b82efd8af642c509df452fec9d0d8e
HEAD_REF master
PATCHES fix-install-paths.patch
PATCHES
fix-install-paths-v3.patch
fix_include.patch
)
set(USE_ZLIB OFF)
@ -16,7 +19,6 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS
"-DGSL_INCLUDE_PATH=${CURRENT_INSTALLED_DIR}/include"
-DTELNETPP_WITH_ZLIB=${USE_ZLIB}
-DTELNETPP_WITH_TESTS=OFF
)
@ -24,11 +26,16 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH share/telnetpp)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/telnetpp-config.cmake" "####################################################################################"
[[####################################################################################
include(CMakeFindDependencyMacro)
find_dependency(Boost)
find_dependency(gsl-lite)
find_dependency(ZLIB)]])
vcpkg_copy_pdbs()
# Remove duplicate header files and CMake input file
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE "${CURRENT_PACKAGES_DIR}/include/telnetpp/version.hpp.in")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(REMOVE
"${CURRENT_PACKAGES_DIR}/include/telnetpp/version.hpp.in"
)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

View File

@ -1,11 +1,11 @@
{
"name": "telnetpp",
"version": "2.1.2",
"port-version": 3,
"description": "Telnet++ is an implementation of the Telnet Session Layer protocol using C++14",
"version": "3.1.0",
"description": "Telnet++ is an implementation of the Telnet Session Layer protocol using C++17",
"homepage": "https://github.com/KazDragon/telnetpp",
"supports": "!uwp",
"dependencies": [
"boost-algorithm",
"boost-container",
"boost-exception",
"boost-range",

View File

@ -8585,8 +8585,8 @@
"port-version": 0
},
"telnetpp": {
"baseline": "2.1.2",
"port-version": 3
"baseline": "3.1.0",
"port-version": 0
},
"tensorflow": {
"baseline": "2.10.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "55b6d710fbf9e885674e8cef12749f7c24a66127",
"version": "3.1.0",
"port-version": 0
},
{
"git-tree": "e251b079bf2c0424b1e06f60ecb93d8eb331704a",
"version": "2.1.2",