Merge pull request #740 from uilianries/poco/1.10.0

Add Poco 1.10.0

recipes/poco/all/conandata.yml

@@ -17,3 +17,6 @@ sources:
   1.9.4:
     sha256: 367014cdbcfe9df8f1d746239902149d2398af9b49ba2c1aaaa88616fd538f61
     url: http://github.com/pocoproject/poco/archive/poco-1.9.4-release.tar.gz
+  1.10.0:
+    sha256: 8047800d5a965d3177e614b4a4a162381e2638220b24d1d15ff5d6cac1738be8
+    url: http://github.com/pocoproject/poco/archive/poco-1.10.0-release.tar.gz

recipes/poco/all/conanfile.py

@@ -2,12 +2,13 @@
 
 from conans import ConanFile, CMake, tools
 from conans.errors import ConanInvalidConfiguration
+from conans.tools import Version
 
 
 class PocoConan(ConanFile):
     name = "poco"
     url = "https://github.com/conan-io/conan-center-index"
-    homepage = "https://pocoproject.org"    
+    homepage = "https://pocoproject.org"
     topics = ("conan", "poco", "building", "networking", "server", "mobile", "embedded")
     exports_sources = "CMakeLists.txt"
     generators = "cmake"
@@ -110,9 +111,13 @@ def _patch(self):
             if self.options.shared:
                 self.output.warn("Adding ws2_32 dependency...")
                 replace = 'Net Util Foundation Crypt32.lib'
+                if Version(self.version) >= "1.10.0":
+                    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 ")
 
                 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

recipes/poco/config.yml

@@ -1,4 +1,6 @@
 versions:
+  1.10.0:
+    folder: all
   1.9.3:
     folder: all
   1.9.4: