diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-18 13:39:14 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-18 13:39:14 -0800 |
| commit | 1fe848e796cad86fe187a5073992af687f9ac492 (patch) | |
| tree | ece66d24c48f88c6a1e3dab0f98df61456d5c8cc | |
| parent | 26a8ed58becf42c2c448aa9ee7621ed2c26319fc (diff) | |
| parent | 0a1a7d664d1861a387094bfe2b9b8c0c71df48d1 (diff) | |
| download | vcpkg-1fe848e796cad86fe187a5073992af687f9ac492.tar.gz vcpkg-1fe848e796cad86fe187a5073992af687f9ac492.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg
| -rw-r--r-- | ports/poco/CONTROL | 2 | ||||
| -rw-r--r-- | ports/poco/find_pcre.patch | 13 | ||||
| -rw-r--r-- | ports/poco/portfile.cmake | 1 |
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) |