From 2e3b4070556543d340f5cf2ca317fa7bdd6b39e3 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Wed, 29 Jan 2020 16:25:42 -0300 Subject: [PATCH] Fix Poco 1.10.0 windows patch Signed-off-by: Uilian Ries --- recipes/poco/all/conanfile.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/poco/all/conanfile.py b/recipes/poco/all/conanfile.py index 57ba44c2b6d6b..238a4efb8ec0d 100644 --- a/recipes/poco/all/conanfile.py +++ b/recipes/poco/all/conanfile.py @@ -115,9 +115,10 @@ def _patch(self): replace = 'Poco::Net Poco::Util Crypt32.lib' tools.replace_in_file(os.path.join(self._source_subfolder, "NetSSL_Win", "CMakeLists.txt"), replace, replace + " ws2_32 ") - if Version(self.version) < "1.10.0": - replace = 'Foundation ${OPENSSL_LIBRARIES}' - tools.replace_in_file(os.path.join(self._source_subfolder, "Crypto", "CMakeLists.txt"), replace, replace + " ws2_32 Crypt32.lib") + replace = 'Foundation ${OPENSSL_LIBRARIES}' + if Version(self.version) >= "1.10.0": + replace = 'Poco::Foundation OpenSSL::SSL OpenSSL::Crypto' + tools.replace_in_file(os.path.join(self._source_subfolder, "Crypto", "CMakeLists.txt"), replace, replace + " ws2_32 Crypt32.lib") # Poco 1.9.x - CMAKE_SOURCE_DIR is required in many places os.rename(os.path.join(self._source_subfolder, "CMakeLists.txt"), os.path.join(self._source_subfolder, "CMakeListsOriginal.cmake"))