diff options
| author | Yury Bura <yurybura@gmail.com> | 2021-09-28 03:12:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 17:12:39 -0700 |
| commit | cc471dc0f59b7b2066d6172c2893419412327a7a (patch) | |
| tree | b3a496ff9a185c17bee8670454c34dd9879fa387 /ports/wt | |
| parent | 3768cef9c204bb168c04b3ba7cb93b10a140a91d (diff) | |
| download | vcpkg-cc471dc0f59b7b2066d6172c2893419412327a7a.tar.gz vcpkg-cc471dc0f59b7b2066d6172c2893419412327a7a.zip | |
[boost] update to 1.77.0 (#19556)
Diffstat (limited to 'ports/wt')
| -rw-r--r-- | ports/wt/0007-boost_1_77_0.patch | 15 | ||||
| -rw-r--r-- | ports/wt/portfile.cmake | 24 | ||||
| -rw-r--r-- | ports/wt/vcpkg.json | 11 |
3 files changed, 39 insertions, 11 deletions
diff --git a/ports/wt/0007-boost_1_77_0.patch b/ports/wt/0007-boost_1_77_0.patch new file mode 100644 index 000000000..8fed5713d --- /dev/null +++ b/ports/wt/0007-boost_1_77_0.patch @@ -0,0 +1,15 @@ + src/Wt/Render/CssParser.C | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Wt/Render/CssParser.C b/src/Wt/Render/CssParser.C +index b8d409e..6bb47b4 100644 +--- a/src/Wt/Render/CssParser.C ++++ b/src/Wt/Render/CssParser.C +@@ -39,6 +39,7 @@ using namespace Wt::Render; + #include <boost/phoenix.hpp> + #endif + #include <boost/spirit/include/classic_file_iterator.hpp> ++#include <boost/foreach.hpp> + + #include <map> + diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index d7d70dab7..30dd1af9a 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -8,16 +8,20 @@ vcpkg_from_github( 0002-link-glew.patch 0005-XML_file_path.patch 0006-GraphicsMagick.patch + 0007-boost_1_77_0.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - dbo ENABLE_LIBWTDBO - postgresql ENABLE_POSTGRES - sqlite3 ENABLE_SQLITE - sqlserver ENABLE_MSSQLSERVER - openssl ENABLE_SSL +vcpkg_check_features( + OUT_FEATURE_OPTIONS + FEATURE_OPTIONS + FEATURES + dbo ENABLE_LIBWTDBO + postgresql ENABLE_POSTGRES + sqlite3 ENABLE_SQLITE + sqlserver ENABLE_MSSQLSERVER + openssl ENABLE_SSL ) if(VCPKG_TARGET_IS_WINDOWS) @@ -40,9 +44,9 @@ else() endif() endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + GENERATOR Ninja OPTIONS -DINSTALL_CONFIG_FILE_PATH="${DOWNLOADS}/wt" -DSHARED_LIBS=${SHARED_LIBS} @@ -70,8 +74,8 @@ vcpkg_configure_cmake( -DCMAKE_INSTALL_DIR=share ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() # There is no way to suppress installation of the headers and resource files in debug build. file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/wt/vcpkg.json b/ports/wt/vcpkg.json index 7a92d9228..303e56c77 100644 --- a/ports/wt/vcpkg.json +++ b/ports/wt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wt", "version-string": "4.5.0", - "port-version": 1, + "port-version": 2, "description": "Wt is a C++ library for developing web applications", "homepage": "https://github.com/emweb/wt", "dependencies": [ @@ -12,6 +12,7 @@ "boost-config", "boost-container-hash", "boost-filesystem", + "boost-foreach", "boost-fusion", "boost-interprocess", "boost-lexical-cast", @@ -43,6 +44,14 @@ "name": "pango", "platform": "!windows" }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ |