Update pococpp package (#150)

* Update Poco version * Disable some broken components * Update poco version * Update version
cpp-pm · Feb 15, 2020 · 1bd2cc9 · 1bd2cc9
1 parent 67c40b9
commit 1bd2cc9
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 19 deletions.
diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake
@@ -113,7 +113,7 @@ hunter_default_version(OpenSceneGraph VERSION 3.6.3-p0)
 hunter_default_version(PNG VERSION 1.6.26-p6)
 hunter_default_version(PROJ4 VERSION 5.0.0)
 hunter_default_version(PhysUnits VERSION 1.1.0-p0)
-hunter_default_version(PocoCpp VERSION 1.7.9-p1)
+hunter_default_version(PocoCpp VERSION 1.10.0-p0)
 hunter_default_version(PostgreSQL VERSION 10.0.0)
 hunter_default_version(Protobuf VERSION 3.10.0-p0)
 

diff --git a/cmake/projects/PocoCpp/hunter.cmake b/cmake/projects/PocoCpp/hunter.cmake
@@ -4,6 +4,17 @@ include(hunter_pick_scheme)
 include(hunter_cacheable)
 include(hunter_download)
 
+hunter_add_version(
+    PACKAGE_NAME
+    PocoCpp
+    VERSION
+    1.10.0-p0
+    URL
+    "https://github.com/cpp-pm/poco/archive/v1.10.0-p0.zip"
+    SHA1
+    5628e07d21d31802405ef4a37e7de22db69177e3
+)
+
 hunter_add_version(
     PACKAGE_NAME
     PocoCpp
@@ -70,20 +81,30 @@ hunter_add_version(
     f392b87edb5bbc2b44aa08cfd72d87da8cc8661f
 )
 
-hunter_cmake_args(
-    PocoCpp
-    CMAKE_ARGS
-        CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE
-        POCO_STATIC=ON
-        ENABLE_CPPUNIT=OFF
-        ENABLE_MONGODB=OFF
-        ENABLE_NETSSL=OFF
-        ENABLE_CRYPTO=OFF
-        ENABLE_DATA=OFF
-        ENABLE_PAGECOMPILER=OFF
-        ENABLE_PAGECOMPILER_FILE2PAGE=OFF
-        ENABLE_REDIS=OFF
-)
+if(HUNTER_PocoCpp_VERSION VERSION_LESS "1.10.0")
+    hunter_cmake_args(
+        PocoCpp
+        CMAKE_ARGS
+            CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE
+            POCO_STATIC=ON
+            ENABLE_CPPUNIT=OFF
+            ENABLE_MONGODB=OFF
+            ENABLE_NETSSL=OFF
+            ENABLE_CRYPTO=OFF
+            ENABLE_DATA=OFF
+            ENABLE_PAGECOMPILER=OFF
+            ENABLE_PAGECOMPILER_FILE2PAGE=OFF
+            ENABLE_REDIS=OFF
+    )
+else()
+    hunter_cmake_args(
+        PocoCpp
+        CMAKE_ARGS
+            ENABLE_CPPUNIT=OFF
+            ENABLE_PAGECOMPILER=OFF
+            ENABLE_PAGECOMPILER_FILE2PAGE=OFF
+    )
+endif()
 
 hunter_pick_scheme(DEFAULT url_sha1_cmake)
 hunter_cacheable(PocoCpp)

diff --git a/docs/packages/pkg/PocoCpp.rst b/docs/packages/pkg/PocoCpp.rst
@@ -12,8 +12,9 @@ PocoCpp
 
 POCO C++ Libraries
 
+-  `Official <https://https://pocoproject.org>`__
 -  `Official Repository <https://github.com/pocoproject/poco>`__
--  `Hunterized Repository <https://github.com/hunter-packages/poco>`__
+-  `Hunterized Repository <https://github.com/cpp-pm/poco>`__
 
 .. code-block:: cmake
 
@@ -33,7 +34,16 @@ Components are as follows:
 - XML (``Poco::XML``)
 - Zip (``Poco::Zip``)
 
-**Note**: Components can be enabled or disabled by using
-`CMAKE_ARGS <https://github.com/cpp-pm/hunter/blob/master/cmake/projects/PocoCpp/hunter.cmake>`__.
+
+**Note**: Components can be enabled or disabled by using following:
+
+.. code-block:: cmake
+
+  hunter_config(PocoCpp VERSION 1.10.0
+    CMAKE_ARGS
+      ENABLE_DATA=OFF
+      ....
+  )
+
 The map between ``CMAKE_ARGS`` and PocoCpp components can be found
-`here <https://github.com/pocoproject/poco/blob/develop/CMakeLists.txt>`__.
+`here <https://pocoproject.org/docs/00200-GettingStarted.html#9>`__.