diff options
| author | JackBoosY <yuzaiyang@beyondsoft.com> | 2019-08-15 03:18:11 -0700 |
|---|---|---|
| committer | JackBoosY <yuzaiyang@beyondsoft.com> | 2019-08-15 03:18:58 -0700 |
| commit | fa5d80b9dd08e37233fd7d47a75b835f4164d556 (patch) | |
| tree | ecf4fe1de3ca4400243ce98d6907fbd8b5ad3e6a | |
| parent | 9711ca77d38212e048b9434dfa6f03ee3c282b1b (diff) | |
| download | vcpkg-fa5d80b9dd08e37233fd7d47a75b835f4164d556.tar.gz vcpkg-fa5d80b9dd08e37233fd7d47a75b835f4164d556.zip | |
[poco]Fix library using pcre.
| -rw-r--r-- | ports/poco/find_pcre.patch | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/ports/poco/find_pcre.patch b/ports/poco/find_pcre.patch index 1a07882bc..3b73ae4f1 100644 --- a/ports/poco/find_pcre.patch +++ b/ports/poco/find_pcre.patch @@ -1,13 +1,22 @@ -diff --git a/cmake/FindPCRE.cmake b/cmake/FindPCRE.cmake
-index 41a99cb..77f3a42 100644
---- a/cmake/FindPCRE.cmake
-+++ b/cmake/FindPCRE.cmake
-@@ -14,7 +14,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/cmake/FindPCRE.cmake b/cmake/FindPCRE.cmake +index 41a99cb..b1acb32 100644 +--- a/cmake/FindPCRE.cmake ++++ b/cmake/FindPCRE.cmake +@@ -14,9 +14,15 @@ ENDIF (PCRE_INCLUDE_DIRS) + + FIND_PATH(PCRE_INCLUDE_DIR pcre.h) + +-SET(PCRE_NAMES pcre) ++if (WIN32) ++include(SelectLibraryConfigurations) ++find_library(PCRE_LIBRARY_RELEASE NAMES pcre) ++find_library(PCRE_LIBRARY_DEBUG NAMES pcred) ++select_library_configurations(PCRE) ++else() ++SET(PCRE_NAMES pcred pcre) + FIND_LIBRARY(PCRE_LIBRARY NAMES ${PCRE_NAMES} ) +- ++endif() + # handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if + # all listed variables are TRUE + INCLUDE(FindPackageHandleStandardArgs) |