diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-06 15:55:59 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-06 15:55:59 -0800 |
| commit | 63e33061e13518701d05bacb811753556c2bc058 (patch) | |
| tree | 9dca5674c6b0b8ccaefe66b8c784848557837857 | |
| parent | acc669e86942dd569884d5241b023a91eed61908 (diff) | |
| parent | 1bfd72480d46845a941f891d232eb8c67b9d146c (diff) | |
| download | vcpkg-63e33061e13518701d05bacb811753556c2bc058.tar.gz vcpkg-63e33061e13518701d05bacb811753556c2bc058.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg
| -rw-r--r-- | ports/poco/CONTROL | 2 | ||||
| -rw-r--r-- | ports/poco/foundation-public-include-pcre.patch | 12 | ||||
| -rw-r--r-- | ports/poco/portfile.cmake | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL index 6f4f7e3b1..ae2758c1f 100644 --- a/ports/poco/CONTROL +++ b/ports/poco/CONTROL @@ -1,4 +1,4 @@ Source: poco -Version: 1.7.6-2 +Version: 1.7.6-3 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/foundation-public-include-pcre.patch b/ports/poco/foundation-public-include-pcre.patch new file mode 100644 index 000000000..ab4403ad8 --- /dev/null +++ b/ports/poco/foundation-public-include-pcre.patch @@ -0,0 +1,12 @@ +diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt +index 76005b1..efc99b6 100644 +--- a/Foundation/CMakeLists.txt ++++ b/Foundation/CMakeLists.txt +@@ -166,6 +166,7 @@ target_link_libraries( "${LIBNAME}" ${SYSLIBS}) + target_include_directories( "${LIBNAME}" + PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> ++ $<BUILD_INTERFACE:${PCRE_INCLUDE_DIRS}> + $<INSTALL_INTERFACE:include> + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src + ) diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index 413f19c7e..e774c3c17 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_apply_patches( PATCHES ${CMAKE_CURRENT_LIST_DIR}/config_h.patch ${CMAKE_CURRENT_LIST_DIR}/find_pcre.patch + ${CMAKE_CURRENT_LIST_DIR}/foundation-public-include-pcre.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) |