aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsdcb <sdflysha@qq.com>2016-11-18 13:46:18 +0800
committersdcb <sdflysha@qq.com>2016-11-18 13:46:18 +0800
commitf3cb18292c2624279606f9e1098b6fc7c3f569a8 (patch)
tree01ed2d29a4526346f964a0d43ac2b0fe03b7ac8d
parenta7af1a727ea2631f7ba7373f6f0c8336881a3dde (diff)
downloadvcpkg-f3cb18292c2624279606f9e1098b6fc7c3f569a8.tar.gz
vcpkg-f3cb18292c2624279606f9e1098b6fc7c3f569a8.zip
Fix poco-pcre debug link issue
Should fix: https://github.com/Microsoft/vcpkg/issues/302
-rw-r--r--ports/poco/CONTROL2
-rw-r--r--ports/poco/find_pcre.patch13
-rw-r--r--ports/poco/portfile.cmake1
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL
index 2265e1f08..6f4f7e3b1 100644
--- a/ports/poco/CONTROL
+++ b/ports/poco/CONTROL
@@ -1,4 +1,4 @@
Source: poco
-Version: 1.7.6-1
+Version: 1.7.6-2
Build-Depends: zlib, pcre, sqlite3, expat
Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems. \ No newline at end of file
diff --git a/ports/poco/find_pcre.patch b/ports/poco/find_pcre.patch
new file mode 100644
index 000000000..b846660f7
--- /dev/null
+++ b/ports/poco/find_pcre.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindPCRE.cmake b/cmake/FindPCRE.cmake
+index 03f07df..4da1895 100644
+--- a/cmake/FindPCRE.cmake
++++ b/cmake/FindPCRE.cmake
+@@ -16,7 +16,7 @@ ENDIF (PCRE_INCLUDE_DIRS)
+
+ FIND_PATH(PCRE_INCLUDE_DIR pcre.h)
+
+-SET(PCRE_NAMES pcre)
++SET(PCRE_NAMES pcred pcre)
+ FIND_LIBRARY(PCRE_LIBRARY NAMES ${PCRE_NAMES} )
+
+ # handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if
diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake
index a707936c4..413f19c7e 100644
--- a/ports/poco/portfile.cmake
+++ b/ports/poco/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/config_h.patch
+ ${CMAKE_CURRENT_LIST_DIR}/find_pcre.patch
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)