Feature/merge origin (#5)

* Update date package to one which compiles with VS2019 (cpp-pm#183) * Add asio, date and zstd to their respective package categories. (cpp-pm#184) * Update of PocoCPP hunter pkg to 1.10.1 (cpp-pm#188) * Update Poco version * Disable some broken components * Update poco version * Update version * Update version * update poco version * update version * update version * Update to new poco version 1.10.1 * Update to v1.10.1-p0 poco version * Updates Boost’s default version to 1.72.0-p1. (cpp-pm#192) This commit updates Boost’s default version to 1.72.0-p1 to take advantage of the cpp-pm#180 fix. * Add 'uuid' package (cpp-pm#193) * Initial commit * First working build. * Add offical url * Add PR number Co-authored-by: Niall Douglas <s_github@nedprod.com> Co-authored-by: Joerg-Christian Boehme <joerg@chaosdorf.de> Co-authored-by: Olli Wang <olliwang@ollix.com>
qdrvm · May 25, 2020 · 5470d12 · 5470d12
1 parent 4f614f0
commit 5470d12
Show file tree

Hide file tree

Showing 13 changed files with 125 additions and 8 deletions.
diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake
@@ -37,7 +37,7 @@ if(MINGW)
   # https://github.com/boostorg/build/issues/301
   hunter_default_version(Boost VERSION 1.64.0)
 else()
-  hunter_default_version(Boost VERSION 1.72.0-p0)
+  hunter_default_version(Boost VERSION 1.72.0-p1)
 endif()
 
 hunter_default_version(Boost.DI VERSION 1.1.0)
@@ -115,7 +115,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.10.0-p0)
+hunter_default_version(PocoCpp VERSION 1.10.1-p0)
 hunter_default_version(PostgreSQL VERSION 10.0.0)
 hunter_default_version(Protobuf VERSION 3.11.2-p0)
 
@@ -232,7 +232,7 @@ hunter_default_version(cvsteer VERSION 0.1.2)
 hunter_default_version(cxxopts VERSION 2.2.0)
 hunter_default_version(czmq VERSION 4.0.2-p1)
 hunter_default_version(damageproto VERSION 1.2.1)
-hunter_default_version(date VERSION 2.4.1)
+hunter_default_version(date VERSION 2.4.1-e12095f)
 hunter_default_version(dbus VERSION 1.10.0-hunter-4)
 hunter_default_version(debug_assert VERSION 1.3.2)
 hunter_default_version(dest VERSION 0.8.0-p4)
@@ -521,6 +521,7 @@ hunter_default_version(type_safe VERSION 0.2.1-p2)
 hunter_default_version(units VERSION 2.3.1)
 hunter_default_version(utf8 VERSION 2.3.4-p1)
 hunter_default_version(util_linux VERSION 2.30.1)
+hunter_default_version(uuid VERSION 1.0.3)
 hunter_default_version(v8 VERSION 7.4.98-p3)
 hunter_default_version(vectorial VERSION 0.0.0-ae7dc88-p0)
 hunter_default_version(vorbis VERSION 1.3.6-p1)

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.1-p0
+    URL
+    "https://github.com/cpp-pm/poco/archive/v1.10.1-p0.zip"
+    SHA1
+    3922c320158ec4c1bc37c10be76ff788d253d64f
+)
+
 hunter_add_version(
     PACKAGE_NAME
     PocoCpp

diff --git a/cmake/projects/date/hunter.cmake b/cmake/projects/date/hunter.cmake
@@ -20,6 +20,17 @@ hunter_add_version(
     4ed983e1d19ee28bc565bd62907d203304b38cf7
 )
 
+hunter_add_version(
+    PACKAGE_NAME
+    date
+    VERSION
+    2.4.1-e12095f
+    URL
+    "https://github.com/HowardHinnant/date/tarball/e12095f26fd523d13e7cffbc87b79775ce2a6f53"
+    SHA1
+    00603b84f7bc99453f5edafe1c5caa72120f5c9d
+)
+
 hunter_cmake_args(date CMAKE_ARGS ENABLE_DATE_TESTING=OFF USE_SYSTEM_TZ_DB=ON)
 
 hunter_pick_scheme(DEFAULT url_sha1_cmake)

diff --git a/cmake/projects/uuid/hunter.cmake b/cmake/projects/uuid/hunter.cmake
@@ -0,0 +1,36 @@
+# !!! DO NOT PLACE HEADER GUARDS HERE !!!
+
+include(hunter_add_version)
+include(hunter_cacheable)
+include(hunter_cmake_args)
+include(hunter_configuration_types)
+include(hunter_download)
+include(hunter_pick_scheme)
+
+hunter_add_version(
+    PACKAGE_NAME
+    uuid
+    VERSION
+    1.0.3
+    URL
+    "https://sourceforge.net/projects/libuuid/files/libuuid-1.0.3.tar.gz/download"
+    SHA1
+    46eaedb875ae6e63677b51ec583656199241d597
+)
+
+hunter_cmake_args(
+    uuid
+    CMAKE_ARGS
+       PKGCONFIG_EXPORT_TARGETS=uuid
+)
+
+hunter_configuration_types(uuid CONFIGURATION_TYPES Release)
+hunter_pick_scheme(DEFAULT url_sha1_autotools)
+hunter_cacheable(uuid)
+hunter_download(
+    PACKAGE_NAME uuid
+    PACKAGE_INTERNAL_DEPS_ID "1"
+    PACKAGE_UNRELOCATABLE_TEXT_FILES
+     "lib/libuuid.la"
+     "lib/pkgconfig/uuid.pc"
+)
diff --git a/docs/packages/compression.rst b/docs/packages/compression.rst
@@ -7,3 +7,4 @@ Compression
  - :ref:`pkg.minizip` - enables to extract files from a .zip archive file.
  - :ref:`pkg.szip`
  - :ref:`pkg.ZLIB` - A massively spiffy yet delicately unobtrusive compression library.
+ - :ref:`pkg.zstd` - Very flexible very fast compression and decompression.
diff --git a/docs/packages/datetime.rst b/docs/packages/datetime.rst
@@ -6,4 +6,5 @@
 Datetime
 --------
 
- - :ref:`pkg.cctz` - library for translating between absolute and civil times using the rules of a time zone
+ - :ref:`pkg.cctz` - library for translating between absolute and civil times using the rules of a time zone.
+ - :ref:`pkg.date` - The future C++ standard `<date>` library, but for earlier C++ compilers.
diff --git a/docs/packages/networking.rst b/docs/packages/networking.rst
@@ -11,6 +11,7 @@
 Networking
 ----------
 
+ - :ref:`pkg.asio` - C++ 11 compatible implementation of the future `<networking>` standard library.
  - :ref:`pkg.autobahn-cpp` -  open-source implementations of the The WebSocket Protocol and The Web Application Messaging Protocol (WAMP>`_ network protocols.
  - :ref:`pkg.Avahi` - Service Discovery for Linux using mDNS/DNS-SD -- compatible with Bonjour
  - :ref:`pkg.Beast` - HTTP and WebSocket built on Boost.Asio in C++11

diff --git a/docs/packages/pkg/date.rst b/docs/packages/pkg/date.rst
@@ -1,19 +1,24 @@
 .. spelling::
 
     date
+    date_interface
 
-.. index::
-  single: unsorted ; date
+.. index:: datetime ; date
 
 .. _pkg.date:
 
 date
 ====
 
-- https://github.com/HowardHinnant/date
+- `Official <https://github.com/HowardHinnant/date>`__
 - `Example <https://github.com/cpp-pm/hunter/blob/master/examples/date/CMakeLists.txt>`__
 
 .. literalinclude:: /../examples/date/CMakeLists.txt
   :language: cmake
   :start-after: # DOCUMENTATION_START {
   :end-before: # DOCUMENTATION_END }
+
+The target to link against changed upstream across versions:
+
+- 2.4.1 and before, it is `date_interface`.
+- 2.4.1-e12095f and after, it is `date::date`.
diff --git a/docs/packages/pkg/uuid.rst b/docs/packages/pkg/uuid.rst
@@ -0,0 +1,20 @@
+.. spelling::
+
+    uuid
+
+.. index::
+  single: unsorted ; uuid
+
+.. _pkg.uuid:
+
+uuid
+====
+
+-  `Official <https://sourceforge.net/projects/libuuid/>`__
+-  `Example <https://github.com/cpp-pm/hunter/blob/master/examples/uuid/CMakeLists.txt>`__
+-  Added by `Joerg-Christian Boehme <https://github.com/Bjoe>`__ (`pr-193 <https://github.com/cpp-pm/hunter/pull/193>`__)
+
+.. literalinclude:: /../examples/uuid/CMakeLists.txt
+  :language: cmake
+  :start-after: # DOCUMENTATION_START {
+  :end-before: # DOCUMENTATION_END }
diff --git a/examples/date/CMakeLists.txt b/examples/date/CMakeLists.txt
@@ -14,5 +14,5 @@ hunter_add_package(date)
 find_package(date CONFIG REQUIRED)
 
 add_executable(boo boo.cpp)
-target_link_libraries(boo PUBLIC date_interface)
+target_link_libraries(boo PUBLIC date::date)
 # DOCUMENTATION_END }
diff --git a/examples/date/boo.cpp b/examples/date/boo.cpp
@@ -7,4 +7,5 @@ int main() {
 
   auto today = floor<days>(system_clock::now());
   std::cout << today << '\n';
+  return 0;
 }
diff --git a/examples/uuid/CMakeLists.txt b/examples/uuid/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Copyright (c)
+# All rights reserved.
+
+cmake_minimum_required(VERSION 3.2)
+
+# Emulate HunterGate:
+# * https://github.com/cpp-pm/gate
+include("../common.cmake")
+
+project(uuid)
+
+# DOCUMENTATION_START {
+hunter_add_package(uuid)
+find_package(uuid CONFIG REQUIRED)
+
+add_executable(boo boo.cpp)
+target_link_libraries(boo PUBLIC PkgConfig::uuid)
+# DOCUMENTATION_END }
diff --git a/examples/uuid/boo.cpp b/examples/uuid/boo.cpp
@@ -0,0 +1,11 @@
+#include <uuid.h>
+#include <iostream>
+
+int main() {
+    char sguid[37];
+    uuid_t uuid = {0};
+    uuid_generate(uuid);
+    uuid_unparse(uuid, sguid);
+    std::cout << sguid << std::endl;
+    return 0;
+}