diff options
| author | Moritz Beutel <mbeutel@users.noreply.github.com> | 2020-01-30 20:36:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-30 11:36:12 -0800 |
| commit | 120348bb2aed04904d94cde15318ff94b4ed95b0 (patch) | |
| tree | 0e22422f3850b7209ae8cb2665d2126b41d3f58d /ports/telnetpp/fix-build-error.patch | |
| parent | 743f62cde2788e73dd5fca53ad39a01ba7b973fe (diff) | |
| download | vcpkg-120348bb2aed04904d94cde15318ff94b4ed95b0.tar.gz vcpkg-120348bb2aed04904d94cde15318ff94b4ed95b0.zip | |
[gsl-lite] Update to version 0.36.0 (#9827)
* [gsl-lite] Update to version 0.36.0
Update the URL to point to the new location of the library.
Use proper CMake installation instead of just deploying the header file.
Have the legacy header <gsl-lite.hpp> produce a diagnostic and forward
to the proper header <gsl/gsl-lite.hpp>.
* [telnetpp] Update telnetpp patch
* Tidy up
Diffstat (limited to 'ports/telnetpp/fix-build-error.patch')
| -rw-r--r-- | ports/telnetpp/fix-build-error.patch | 92 |
1 files changed, 30 insertions, 62 deletions
diff --git a/ports/telnetpp/fix-build-error.patch b/ports/telnetpp/fix-build-error.patch index 92ad5bd29..d72ced01e 100644 --- a/ports/telnetpp/fix-build-error.patch +++ b/ports/telnetpp/fix-build-error.patch @@ -1,18 +1,19 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 09b4f9b..feb3746 100644 +index 09b4f9b..6f72c41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -22,9 +22,6 @@ message("Building Telnet++ with zlib: ${TELNETPP_WITH_ZLIB}") +@@ -22,8 +22,8 @@ message("Building Telnet++ with zlib: ${TELNETPP_WITH_ZLIB}") message("Building Telnet++ with code coverage: ${TELNETPP_COVERAGE}") message("Building Telnet++ with sanitizers: ${TELNETPP_SANITIZE}") -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS NO_OUTPUT_DIRS) -- ++find_package(gsl-lite REQUIRED) ++find_package(Boost REQUIRED COMPONENTS container) + # The required C++ Standard for Telnet++ is C++14. set(CMAKE_CXX_STANDARD 14) - -@@ -154,18 +151,24 @@ add_library(telnetpp +@@ -154,18 +154,24 @@ add_library(telnetpp ${TELNETPP_PRIVATE_INCLUDE_FILES} ) @@ -28,9 +29,9 @@ index 09b4f9b..feb3746 100644 - CONAN_PKG::boost_container - CONAN_PKG::boost_signals2 - CONAN_PKG::boost_variant -+ ${BOOST_CONTAINER_LIBRARY} -+ ${BOOST_SIGNALS2_LIBRARY} -+ ${BOOST_VARIANT_LIBRARY} ++ gsl::gsl-lite ++ Boost::boost ++ Boost::container ) if (TELNETPP_WITH_ZLIB) @@ -38,21 +39,21 @@ index 09b4f9b..feb3746 100644 target_link_libraries(telnetpp PRIVATE - CONAN_PKG::zlib -+ ${ZLIB_LIBRARIES} ++ ZLIB::ZLIB ) endif() -@@ -180,7 +183,8 @@ target_include_directories(telnetpp +@@ -179,8 +185,7 @@ set_target_properties(telnetpp + target_include_directories(telnetpp PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> - $<INSTALL_INTERFACE:include/telnetpp-${TELNETPP_VERSION}> +- $<INSTALL_INTERFACE:include/telnetpp-${TELNETPP_VERSION}> - "${Boost_INCLUDE_DIRS}" -+ $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}> -+ $<BUILD_INTERFACE:${GSL_INCLUDE_PATH}> ++ $<INSTALL_INTERFACE:include> ) generate_export_header(telnetpp -@@ -197,17 +201,19 @@ install( +@@ -197,17 +202,19 @@ install( telnetpp EXPORT telnetpp-config @@ -75,7 +76,7 @@ index 09b4f9b..feb3746 100644 ) export( -@@ -221,7 +227,7 @@ install( +@@ -221,7 +228,7 @@ install( EXPORT telnetpp-config DESTINATION @@ -84,7 +85,7 @@ index 09b4f9b..feb3746 100644 ) include(CMakePackageConfigHelpers) -@@ -236,7 +242,7 @@ install( +@@ -236,7 +243,7 @@ install( FILES "${CMAKE_CURRENT_BINARY_DIR}/telnetpp-config-version.cmake" DESTINATION @@ -93,24 +94,8 @@ index 09b4f9b..feb3746 100644 ) if (TELNETPP_WITH_TESTS) -@@ -299,13 +305,13 @@ if (TELNETPP_WITH_TESTS) - target_link_libraries(telnetpp_tester - PRIVATE - telnetpp -- CONAN_PKG::gtest -+ GTest::GTest GTest::Main - ) - - if (TELNETPP_WITH_ZLIB) - target_link_libraries(telnetpp_tester - PRIVATE -- CONAN_PKG::zlib -+ ${ZLIB_LIBRARIES} - ) - endif() - diff --git a/include/telnetpp/core.hpp b/include/telnetpp/core.hpp -index 2362fac..48d340e 100644 +index 2362fac..8710d36 100644 --- a/include/telnetpp/core.hpp +++ b/include/telnetpp/core.hpp @@ -1,7 +1,7 @@ @@ -118,35 +103,18 @@ index 2362fac..48d340e 100644 #include "telnetpp/detail/export.hpp" -#include <gsl-lite.h> -+#include <gsl-lite.hpp> ++#include <gsl/gsl-lite.hpp> #include <string> #include <cstdint> -diff --git a/include/telnetpp/subnegotiation.hpp b/include/telnetpp/subnegotiation.hpp -index a209b72..1f24fc9 100644 ---- a/include/telnetpp/subnegotiation.hpp -+++ b/include/telnetpp/subnegotiation.hpp -@@ -15,7 +15,11 @@ public: - //* ===================================================================== - /// \brief Constructor - //* ===================================================================== -+#if _WIN32 -+ const subnegotiation(option_type option, bytes content) noexcept -+#else - constexpr subnegotiation(option_type option, bytes content) noexcept -+#endif - : option_(std::move(option)), - content_(std::move(content)) - { -@@ -32,7 +36,11 @@ public: - //* ===================================================================== - /// \brief Returns the content for this subnegotiation. - //* ===================================================================== -+#if _WIN32 -+ const bytes content() const noexcept -+#else - constexpr bytes content() const noexcept -+#endif - { - return content_; - } +diff --git a/src/options/msdp/detail/decoder.cpp b/src/options/msdp/detail/decoder.cpp +index c0b7906..e725693 100644 +--- a/src/options/msdp/detail/decoder.cpp ++++ b/src/options/msdp/detail/decoder.cpp +@@ -1,5 +1,6 @@ + #include "telnetpp/options/msdp/detail/decoder.hpp" + #include "telnetpp/options/msdp/detail/protocol.hpp" ++#include <vector> + #include <cassert> + #include <functional> + |
