3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

Update downstream libraries to use modularized boost

Browse Source
This commit is contained in:
Robert Schumacher 2017-12-05 13:01:50 -08:00
parent 14358e8b25
commit b79395c4ad
32 changed files with 227 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/arrow/CONTROL
View File

@ -1,4 +1,4 @@
Source: arrow Source: arrow
Version: 0.6.0 Version: 0.6.0-1
Build-Depends: boost, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags
Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations. Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.

5
ports/arrow/portfile.cmake
View File

@ -12,7 +12,6 @@ vcpkg_from_github(
HEAD_REF master HEAD_REF master
) )
set(CPP_SOURCE_PATH "${SOURCE_PATH}/cpp") set(CPP_SOURCE_PATH "${SOURCE_PATH}/cpp")
vcpkg_apply_patches( vcpkg_apply_patches(
@ -27,7 +26,9 @@ string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${CPP_SOURCE_PATH} SOURCE_PATH ${CPP_SOURCE_PATH}
OPTIONS -DARROW_BUILD_TESTS=off PREFER_NINJA
OPTIONS
-DARROW_BUILD_TESTS=off
-DRAPIDJSON_HOME=${CURRENT_INSTALLED_DIR} -DRAPIDJSON_HOME=${CURRENT_INSTALLED_DIR}
-DFLATBUFFERS_HOME=${CURRENT_INSTALLED_DIR} -DFLATBUFFERS_HOME=${CURRENT_INSTALLED_DIR}
-DARROW_ZLIB_VENDORED=ON -DARROW_ZLIB_VENDORED=ON

4
ports/beast/CONTROL
View File

@ -1,4 +1,4 @@
Source: beast Source: beast
Version: v84-1 Version: 0
Build-Depends: boost Build-Depends: boost-beast
Description: HTTP/1 and WebSocket, header-only using Boost.Asio and C++11 Description: HTTP/1 and WebSocket, header-only using Boost.Asio and C++11

14
ports/beast/portfile.cmake
View File

@ -1,13 +1 @@
# header only set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO vinniefalco/Beast
REF 32902fad8b7c57be27b96e00ed6ec82748732133
SHA512 409bd23e19c4bb157619405713f73b90c5f680bec487ad7b6fc8bcd30db54444a78950ce631c8e267e4397b9128679528fd237d3c53f7e1e55634473a169af5f
HEAD_REF master
)
file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/beast RENAME copyright)

4
ports/blaze/CONTROL
View File

@ -1,4 +1,4 @@
Source: blaze Source: blaze
Version: 3.2-2 Version: 3.2-3
Build-Depends: boost, clapack Build-Depends: clapack, boost-exception
Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic. Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.

4
ports/bond/CONTROL
View File

@ -1,5 +1,5 @@
Source: bond Source: bond
Maintainer: bond@microsoft.com Maintainer: bond@microsoft.com
Version: 7.0.2 Version: 7.0.2-1
Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services. <https://github.com/Microsoft/bond> Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services. <https://github.com/Microsoft/bond>
Build-Depends: boost, rapidjson Build-Depends: rapidjson, boost-config, boost-utility, boost-assign

1
ports/bond/portfile.cmake
View File

@ -37,6 +37,7 @@ vcpkg_apply_patches(
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS OPTIONS
-DBOND_LIBRARIES_ONLY=TRUE -DBOND_LIBRARIES_ONLY=TRUE
-DBOND_GBC_PATH=${FETCHED_GBC_PATH} -DBOND_GBC_PATH=${FETCHED_GBC_PATH}

4
ports/cgal/CONTROL
View File

@ -1,4 +1,4 @@
Source: cgal Source: cgal
Version: 4.11 Version: 4.11-1
Build-Depends:mpfr, mpir, zlib, boost, qt5 Build-Depends: mpfr, mpir, zlib, qt5, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random
Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry. Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.

1
ports/cgal/portfile.cmake
View File

@ -10,6 +10,7 @@ vcpkg_from_github(
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
) )
vcpkg_install_cmake() vcpkg_install_cmake()

4
ports/cpprestsdk/CONTROL
View File

@ -1,5 +1,5 @@
Source: cpprestsdk Source: cpprestsdk
Version: 2.10.1 Version: 2.10.1-1
Build-Depends: zlib, openssl (windows), boost (windows), websocketpp (windows) Build-Depends: zlib, openssl (windows), boost-system (windows), boost-date-time (windows), boost-regex (windows), websocketpp (windows)
Description: C++11 JSON, REST, and OAuth library Description: C++11 JSON, REST, and OAuth library
The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services. The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.

6
ports/cpprestsdk/portfile.cmake
View File

@ -16,6 +16,11 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH}) -DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH})
endif() endif()
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/undef-minmax.patch"
)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/Release SOURCE_PATH ${SOURCE_PATH}/Release
PREFER_NINJA PREFER_NINJA
@ -25,6 +30,7 @@ vcpkg_configure_cmake(
-DBUILD_SAMPLES=OFF -DBUILD_SAMPLES=OFF
-DCPPREST_EXCLUDE_WEBSOCKETS=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=OFF
-DCPPREST_EXPORT_DIR=share/cpprestsdk -DCPPREST_EXPORT_DIR=share/cpprestsdk
-DWERROR=OFF
OPTIONS_DEBUG OPTIONS_DEBUG
-DCPPREST_INSTALL_HEADERS=OFF -DCPPREST_INSTALL_HEADERS=OFF
) )

14
ports/cpprestsdk/undef-minmax.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/Release/src/http/client/http_client_winrt.cpp b/Release/src/http/client/http_client_winrt.cpp
index 697f48a..4ada65a 100644
--- a/Release/src/http/client/http_client_winrt.cpp
+++ b/Release/src/http/client/http_client_winrt.cpp
@@ -28,6 +28,9 @@ using namespace std;
using namespace Platform;
using namespace Microsoft::WRL;
+#undef min
+#undef max
+
namespace web
{
namespace http

2
ports/fcl/CONTROL
View File

@ -1,4 +1,4 @@
Source: fcl Source: fcl
Version: 0.5.0-3 Version: 0.5.0-3
Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles
Build-Depends: boost, ccd, octomap Build-Depends: ccd, octomap

4
ports/folly/CONTROL
View File

@ -1,4 +1,4 @@
Source: folly Source: folly
Version: 2017.11.27.00 Version: 2017.11.27.00-1
Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
Build-Depends: zlib, openssl, boost, libevent, double-conversion, glog, gflags, lz4, liblzma, snappy Build-Depends: zlib, openssl, libevent, double-conversion, glog, gflags, lz4, liblzma, snappy, boost-context, boost-chrono, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread, boost-conversion, boost-multi-index, boost-crc

4
ports/hpx/CONTROL
View File

@ -1,5 +1,5 @@
Source: hpx Source: hpx
Version: 1.0.0-5 Version: 1.0.0-6
Build-Depends: boost, hwloc Build-Depends: hwloc, boost-chrono, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread, boost-context, boost-iostreams, boost-random, boost-atomic, boost-asio, boost-dynamic-bitset, boost-assign, boost-format, boost-signals2, boost-parameter, boost-bimap, boost-accumulators, boost-lockfree, boost-icl
Description: The C++ Standards Library for Concurrency and Parallelism Description: The C++ Standards Library for Concurrency and Parallelism
HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case. HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case.

1
ports/hpx/portfile.cmake
View File

@ -44,6 +44,7 @@ SET(HWLOC_PATH "${CURRENT_INSTALLED_DIR}/share/hwloc")
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS OPTIONS
-DBOOST_ROOT=${BOOST_PATH} -DBOOST_ROOT=${BOOST_PATH}
-DHWLOC_ROOT=${HWLOC_ROOT} -DHWLOC_ROOT=${HWLOC_ROOT}

4
ports/libkml/CONTROL
View File

@ -1,4 +1,4 @@
Source: libkml Source: libkml
Version: 1.3.0-1 Version: 1.3.0-2
Description: Reference implementation of OGC KML 2.2 Description: Reference implementation of OGC KML 2.2
Build-Depends: zlib, boost, expat, minizip, uriparser Build-Depends: zlib, expat, minizip, uriparser, boost-smart-ptr

1
ports/libkml/portfile.cmake
View File

@ -13,6 +13,7 @@ vcpkg_apply_patches(
"${CMAKE_CURRENT_LIST_DIR}/patch_empty_literal_on_vc.patch" "${CMAKE_CURRENT_LIST_DIR}/patch_empty_literal_on_vc.patch"
) )
file(REMOVE ${SOURCE_PATH}/cmake/External_boost.cmake)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}

4
ports/libtorrent/CONTROL
View File

@ -1,4 +1,4 @@
Source: libtorrent Source: libtorrent
Version: 1.1.5 Version: 1.1.5-1
Description: An efficient feature complete C++ BitTorrent implementation Description: An efficient feature complete C++ BitTorrent implementation
Build-Depends: boost, openssl Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config

42
ports/libtorrent/portfile.cmake
View File

@ -1,37 +1,25 @@
# Common Ambient Variables:
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
#
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libtorrent-libtorrent-1_1_5)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/arvidn/libtorrent/archive/libtorrent-1_1_5.zip"
FILENAME "libtorrent-1_1_5.zip"
SHA512 ebb7c1b08a4b07b4db54050a099950dc61446e2e7fcceb82c5db8e0629c7718c3c8808ee59d5f361ad85c75f7034a33dfcb5ebd619ef0bb9b5ae0cfdd10d01b5
)
vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO arvidn/libtorrent
REF libtorrent-1_1_5
SHA512 edaff6347bf922af8b6d74e332e180fe122f64152a152fb905f4f2c3371dc29d668fc2b0ffcda3f56b50a1a51b25d1a3ae4284ed6e09f6a2eb7b34bcce8dd9c7
HEAD_REF master
)
vcpkg_apply_patches( vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/add-datetime-to-boost-libs.patch PATCHES ${CMAKE_CURRENT_LIST_DIR}/add-datetime-to-boost-libs.patch
PATCHES ${CMAKE_CURRENT_LIST_DIR}/add-dbghelp-to-win32-libs.patch ${CMAKE_CURRENT_LIST_DIR}/add-dbghelp-to-win32-libs.patch
PATCHES ${CMAKE_CURRENT_LIST_DIR}/vcpkg-boost-madness.patch
) )
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTORRENT_SHARED)
set(LIBTORRENT_SHARED ON)
else() file(READ "${SOURCE_PATH}/include/libtorrent/export.hpp" _contents)
set(LIBTORRENT_SHARED OFF) string(REPLACE "<boost/config/select_compiler_config.hpp>" "<boost/config/detail/select_compiler_config.hpp>" _contents "${_contents}")
endif() string(REPLACE "<boost/config/select_platform_config.hpp>" "<boost/config/detail/select_platform_config.hpp>" _contents "${_contents}")
file(WRITE "${SOURCE_PATH}/include/libtorrent/export.hpp" "${_contents}")
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
@ -43,7 +31,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake() vcpkg_install_cmake()
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
# Put shared libraries into the proper directory # Put shared libraries into the proper directory
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)

13
ports/libtorrent/vcpkg-boost-madness.patch
View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99698a2..454bae6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,7 +252,7 @@ else()
set(Boost_USE_STATIC_RUNTIME ON)
endif()
- set(Boost_USE_STATIC_LIBS ON)
+ set(Boost_USE_STATIC_LIBS OFF)
add_library(torrent-rasterbar STATIC ${sources2})
endif()

4
ports/mongo-cxx-driver/CONTROL
View File

@ -1,4 +1,4 @@
Source: mongo-cxx-driver Source: mongo-cxx-driver
Version: 3.1.1-1 Version: 3.1.1-2
Build-Depends: boost, libbson, mongo-c-driver Build-Depends: libbson, mongo-c-driver, boost-smart-ptr, boost-optional, boost-utility
Description: MongoDB C++ Driver. Description: MongoDB C++ Driver.

4
ports/openimageio/CONTROL
View File

@ -1,4 +1,4 @@
Source: openimageio Source: openimageio
Version: 1.7.15-1 Version: 1.7.15-2
Description: An library for reading and writing images, and a bunch of related classes, utilities, and application Description: An library for reading and writing images, and a bunch of related classes, utilities, and application
Build-Depends: boost, libjpeg-turbo, tiff, libpng, openexr Build-Depends: libjpeg-turbo, tiff, libpng, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random

6
ports/openvdb/CONTROL
View File

@ -1,8 +1,8 @@
Source: openvdb Source: openvdb
Version: 5.0.0 Version: 5.0.0-1
Build-Depends: boost, ilmbase, openexr, tbb, blosc Build-Depends: ilmbase, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess
Description: Sparse volume data structure and tools Description: Sparse volume data structure and tools
Feature: tools Feature: tools
Description: OpenVDB utilities: view, print and render Description: OpenVDB utilities: view, print and render
Build-Depends: glew, glfw3 Build-Depends: glew, glfw3

4
ports/pcl/CONTROL
View File

@ -1,7 +1,7 @@
Source: pcl Source: pcl
Version: 1.8.1-8 Version: 1.8.1-9
Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing. Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
Build-Depends: boost, eigen3, flann, qhull, vtk Build-Depends: eigen3, flann, qhull, vtk, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio
Feature: openni2 Feature: openni2
Description: OpenNI2 support for PCL Description: OpenNI2 support for PCL

4
ports/thrift/CONTROL
View File

@ -1,4 +1,4 @@
Source: thrift Source: thrift
Version: 20172805-72ca60debae1d9fb35d9f0085118873669006d7f-1 Version: 20172805-72ca60debae1d9fb35d9f0085118873669006d7f-2
Build-Depends: boost, zlib, libevent, openssl Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit
Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010. Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010.

2
ports/thrift/portfile.cmake
View File

@ -22,9 +22,11 @@ vcpkg_from_github(
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS OPTIONS
-DWITH_SHARED_LIB=OFF -DWITH_SHARED_LIB=OFF
-DWITH_STATIC_LIB=ON -DWITH_STATIC_LIB=ON
-DWITH_STDTHREADS=ON
-DBUILD_TESTING=off -DBUILD_TESTING=off
-DBUILD_JAVA=off -DBUILD_JAVA=off
-DBUILD_C_GLIB=off -DBUILD_C_GLIB=off

2
ports/websocketpp/CONTROL
View File

@ -1,4 +1,4 @@
Source: websocketpp Source: websocketpp
Version: 0.7.0-1 Version: 0.7.0-1
Build-Depends: zlib, openssl, boost Build-Depends: zlib, openssl, boost-asio
Description: Library that implements RFC6455 The WebSocket Protocol Description: Library that implements RFC6455 The WebSocket Protocol

4
ports/wt/CONTROL
View File

@ -1,4 +1,4 @@
Source: wt Source: wt
Version: 3.3.7-2 Version: 3.3.7-4
Description: Wt is a C++ library for developing web applications Description: Wt is a C++ library for developing web applications
Build-Depends: boost, openssl, sqlite3, libpq, pango Build-Depends: openssl, sqlite3, libpq, pango, boost-date-time, boost-regex, boost-program-options, boost-signals, boost-system, boost-filesystem, boost-thread, boost-random, boost-multi-index, boost-signals2, boost-asio, boost-ublas, boost-conversion, boost-array, boost-smart-ptr, boost-tuple, boost-algorithm, boost-logic

123
ports/wt/boost-1.66.patch Normal file
View File

@ -0,0 +1,123 @@
diff --git a/src/http/Connection.C b/src/http/Connection.C
index 70ecfd5..b24c817 100644
--- a/src/http/Connection.C
+++ b/src/http/Connection.C
@@ -339,7 +339,7 @@ void Connection::handleReadBody(ReplyPtr reply,
const asio_error_code& e,
std::size_t bytes_transferred)
{
- LOG_DEBUG(socket().native() << ": handleReadBody(): " << e.message());
+ LOG_DEBUG(socket().native_handle() << ": handleReadBody(): " << e.message());
if (disconnectCallback_) {
rcv_body_buffer_ = false;
@@ -350,7 +350,7 @@ void Connection::handleReadBody(ReplyPtr reply,
disconnectCallback_ = boost::function<void()>();
f();
} else if (!e) {
- LOG_ERROR(socket().native()
+ LOG_ERROR(socket().native_handle()
<< ": handleReadBody(): while waiting for disconnect, "
"received unexpected data, closing");
close();
@@ -471,3 +471,4 @@ void Connection::handleWriteResponse(ReplyPtr reply,
} // namespace server
} // namespace http
+
diff --git a/src/http/Connection.h b/src/http/Connection.h
index 712f736..dabba21 100644
--- a/src/http/Connection.h
+++ b/src/http/Connection.h
@@ -72,7 +72,7 @@ public:
virtual ~Connection();
Server *server() const { return server_; }
- asio::strand& strand() { return strand_; }
+ asio::io_service::strand& strand() { return strand_; }
/// Stop all asynchronous operations associated with the connection.
void scheduleStop();
@@ -113,7 +113,7 @@ protected:
/// The manager for this connection.
ConnectionManager& ConnectionManager_;
- asio::strand strand_;
+ asio::io_service::strand strand_;
void finishReply();
@@ -204,3 +204,4 @@ typedef boost::shared_ptr<Connection> ConnectionPtr;
} // namespace http
#endif // HTTP_CONNECTION_HPP
+
diff --git a/src/http/Reply.C b/src/http/Reply.C
index f7fe2aa..603b9ea 100644
--- a/src/http/Reply.C
+++ b/src/http/Reply.C
@@ -593,7 +593,7 @@ bool Reply::encodeNextContentBuffer(
originalSize += bs;
gzipStrm_.avail_in = bs;
- gzipStrm_.next_in = (unsigned char *)asio::detail::buffer_cast_helper(b);
+ gzipStrm_.next_in = (unsigned char *)b.data();
unsigned char out[16*1024];
do {
@@ -642,3 +642,4 @@ bool Reply::encodeNextContentBuffer(
} // namespace server
} // namespace http
+
diff --git a/src/http/Server.h b/src/http/Server.h
index 3260a23..c924ed2 100644
--- a/src/http/Server.h
+++ b/src/http/Server.h
@@ -120,7 +120,7 @@ private:
Wt::WLogger accessLogger_;
/// The strand for handleTcpAccept(), handleSslAccept() and handleStop()
- asio::strand accept_strand_;
+ asio::io_service::strand accept_strand_;
/// Acceptor used to listen for incoming http connections.
asio::ip::tcp::acceptor tcp_acceptor_;
@@ -164,3 +164,4 @@ void handleTimeout(asio_timer *timer,
} // namespace http
#endif // HTTP_SERVER_HPP
+
diff --git a/src/wt/WServerGLWidget.C b/src/wt/WServerGLWidget.C
index a1fb5ee..7e1d31e 100644
--- a/src/wt/WServerGLWidget.C
+++ b/src/wt/WServerGLWidget.C
@@ -36,8 +36,9 @@ typedef GLXContext (*glXCreateContextAttribsARBProc)(Display*, GLXFBConfig, GLXC
#endif
#ifdef WIN32_GL
-#include <GL/wglew.h>
+#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
+#include <GL/wglew.h>
#endif
#ifdef APPLE_GL
diff --git a/src/wt/http/Client.C b/src/wt/http/Client.C
index 2c4e07d..ca793d4 100644
--- a/src/wt/http/Client.C
+++ b/src/wt/http/Client.C
@@ -605,7 +605,7 @@ private:
protected:
WIOService& ioService_;
- boost::asio::strand strand_;
+ boost::asio::io_service::strand strand_;
tcp::resolver resolver_;
boost::asio::streambuf requestBuf_;
boost::asio::streambuf responseBuf_;
@@ -1060,3 +1060,4 @@ bool Client::parseUrl(const std::string &url, URL &parsedUrl)
}
}
+

19
ports/wt/guard-NO_ERROR.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/src/wt/WGLWidget b/src/wt/WGLWidget
index dd39701..94634f7 100644
--- a/src/wt/WGLWidget
+++ b/src/wt/WGLWidget
@@ -798,7 +798,14 @@ public:
SAMPLE_COVERAGE = 0x80A0,
/* ErrorCode */
+#ifdef _WIN32
+#pragma push_macro ("NO_ERROR")
+#undef NO_ERROR
+#endif
NO_ERROR = 0x0,
+#ifdef _WIN32
+#pragma pop_macro ("NO_ERROR")
+#endif
INVALID_ENUM = 0x0500,
INVALID_VALUE = 0x0501,
INVALID_OPERATION = 0x0502,

11
ports/wt/portfile.cmake
View File

@ -10,14 +10,13 @@ vcpkg_from_github(
vcpkg_apply_patches( vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/add-disable-boost-autolink-option.patch PATCHES
${CMAKE_CURRENT_LIST_DIR}/add-disable-boost-autolink-option.patch
${CMAKE_CURRENT_LIST_DIR}/guard-NO_ERROR.patch
${CMAKE_CURRENT_LIST_DIR}/boost-1.66.patch
) )
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS)
set(SHARED_LIBS ON)
else()
set(SHARED_LIBS OFF)
endif()
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}