From f3cb18292c2624279606f9e1098b6fc7c3f569a8 Mon Sep 17 00:00:00 2001 From: sdcb Date: Fri, 18 Nov 2016 13:46:18 +0800 Subject: [PATCH] Fix poco-pcre debug link issue Should fix: https://github.com/Microsoft/vcpkg/issues/302 --- ports/poco/CONTROL | 2 +- ports/poco/find_pcre.patch | 13 +++++++++++++ ports/poco/portfile.cmake | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/poco/find_pcre.patch diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL index 2265e1f083..6f4f7e3b1e 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 0000000000..b846660f7b --- /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 a707936c40..413f19c7e1 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)