From b9c7ddd41bd7199254f1cff106e2a3c2d6411574 Mon Sep 17 00:00:00 2001 From: Tetsuya Hayashi Date: Sun, 30 Jun 2019 18:23:38 +0900 Subject: [PATCH 1/2] [poco] Fixed the release libraries are linked to debug pcred.dll --- ports/poco/find_pcre.patch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/poco/find_pcre.patch b/ports/poco/find_pcre.patch index 1a07882bcd283b..4b851121ac5bf4 100644 --- a/ports/poco/find_pcre.patch +++ b/ports/poco/find_pcre.patch @@ -1,13 +1,17 @@ diff --git a/cmake/FindPCRE.cmake b/cmake/FindPCRE.cmake -index 41a99cb..77f3a42 100644 +index 41a99cb57..3236b97e8 100644 --- a/cmake/FindPCRE.cmake +++ b/cmake/FindPCRE.cmake -@@ -14,7 +14,7 @@ ENDIF (PCRE_INCLUDE_DIRS) +@@ -14,7 +14,11 @@ ENDIF (PCRE_INCLUDE_DIRS) FIND_PATH(PCRE_INCLUDE_DIR pcre.h) -SET(PCRE_NAMES pcre) -+SET(PCRE_NAMES pcred pcre) ++if(CMAKE_BUILD_TYPE STREQUAL Debug) ++ SET(PCRE_NAMES pcre${CMAKE_DEBUG_POSTFIX}) ++else() ++ SET(PCRE_NAMES pcre) ++endif() FIND_LIBRARY(PCRE_LIBRARY NAMES ${PCRE_NAMES} ) # handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if From 8eb0a1a6a7a907401eeb7e242bd680a76014548a Mon Sep 17 00:00:00 2001 From: Tetsuya Hayashi Date: Mon, 1 Jul 2019 07:38:51 +0900 Subject: [PATCH 2/2] Modified to place pcred and pcre using CMAKE_DEBUG_POSTFIX doesn't work for the other platforms. --- ports/poco/find_pcre.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/poco/find_pcre.patch b/ports/poco/find_pcre.patch index 4b851121ac5bf4..96f1185f4f81c9 100644 --- a/ports/poco/find_pcre.patch +++ b/ports/poco/find_pcre.patch @@ -8,9 +8,9 @@ index 41a99cb57..3236b97e8 100644 -SET(PCRE_NAMES pcre) +if(CMAKE_BUILD_TYPE STREQUAL Debug) -+ SET(PCRE_NAMES pcre${CMAKE_DEBUG_POSTFIX}) ++ SET(PCRE_NAMES pcred pcre) +else() -+ SET(PCRE_NAMES pcre) ++ SET(PCRE_NAMES pcre pcred) +endif() FIND_LIBRARY(PCRE_LIBRARY NAMES ${PCRE_NAMES} )