Skip to content

Commit 3895230

Browse files
authored
[wt] fix HPDF::HPDF link error (microsoft#49495)
1 parent 9401ee2 commit 3895230

File tree

5 files changed

+38
-1
lines changed

5 files changed

+38
-1
lines changed

ports/wt/0007-fix-haru.patch

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 5826718..06cfe04 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -275,8 +275,8 @@ find_package(GLEW)
6+
7+
find_package(Asciidoctor)
8+
9+
-set(HPDF_ROOT ${HARU_PREFIX})
10+
-find_package(HPDF)
11+
+find_package(HPDF NAMES unofficial-libharu CONFIG REQUIRED)
12+
+add_library(HPDF::HPDF ALIAS unofficial::libharu::hpdf)
13+
14+
set(OPENSSL_ROOT_DIR ${SSL_PREFIX})
15+
find_package(OpenSSL)
16+
diff --git a/wt-config.cmake.in b/wt-config.cmake.in
17+
index a3693d3..4df41c2 100644
18+
--- a/wt-config.cmake.in
19+
+++ b/wt-config.cmake.in
20+
@@ -5,7 +5,9 @@ if(@_WTCONFIG_CMAKE_FIND_BOOST@)
21+
find_package(Boost QUIET
22+
COMPONENTS @Boost_COMPONENTS@)
23+
endif()
24+
-
25+
+if(@ENABLE_HARU@)
26+
+ find_package(unofficial-libharu QUIET)
27+
+endif()
28+
# Required target
29+
include(${CMAKE_CURRENT_LIST_DIR}/wt-target-wt.cmake)
30+
# Optional targets

ports/wt/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ vcpkg_from_github(
77
PATCHES
88
0005-XML_file_path.patch
99
0006-GraphicsMagick.patch
10+
0007-fix-haru.patch
1011
)
1112

1213
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS)

ports/wt/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "wt",
33
"version": "4.12.1",
4+
"port-version": 1,
45
"description": "Wt is a C++ library for developing web applications",
56
"homepage": "https://github.com/emweb/wt",
67
"license": "GPL-2.0-only",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10742,7 +10742,7 @@
1074210742
},
1074310743
"wt": {
1074410744
"baseline": "4.12.1",
10745-
"port-version": 0
10745+
"port-version": 1
1074610746
},
1074710747
"wtl": {
1074810748
"baseline": "10.0.10320",

versions/w-/wt.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "82c24ff24e915a936ca2151fb8efc9657657146b",
5+
"version": "4.12.1",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "1f3bb1d5df5750aa6f518109e039a2892cb75315",
510
"version": "4.12.1",

0 commit comments

Comments
 (0)