Skip to content

Commit

Permalink
Fix Poco 1.10.0 windows patch
Browse files Browse the repository at this point in the history
Signed-off-by: Uilian Ries <[email protected]>
  • Loading branch information
uilianries committed Jan 29, 2020
1 parent 73bba96 commit 2e3b407
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions recipes/poco/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down

0 comments on commit 2e3b407

Please sign in to comment.