From cd4908b70126172e2ecd41c6d31df781174d0841 Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Thu, 28 Sep 2017 13:02:17 -0400 Subject: [PATCH 1/6] Add libdill. --- cmake/projects/libdill/hunter.cmake | 20 ++++++++++++++++++++ docs/packages/concurrency.rst | 2 ++ docs/packages/pkg/libdill.rst | 21 +++++++++++++++++++++ examples/libdill/CMakeLists.txt | 12 ++++++++++++ examples/libdill/main.cpp | 6 ++++++ 5 files changed, 61 insertions(+) create mode 100644 cmake/projects/libdill/hunter.cmake create mode 100644 docs/packages/pkg/libdill.rst create mode 100644 examples/libdill/CMakeLists.txt create mode 100644 examples/libdill/main.cpp diff --git a/cmake/projects/libdill/hunter.cmake b/cmake/projects/libdill/hunter.cmake new file mode 100644 index 0000000000..b8db5d9eb0 --- /dev/null +++ b/cmake/projects/libdill/hunter.cmake @@ -0,0 +1,20 @@ +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +include(hunter_add_version) +include(hunter_cacheable) +include(hunter_cmake_args) +include(hunter_download) +include(hunter_pick_scheme) + +hunter_add_version( + PACKAGE_NAME libdill + VERSION "1.18" + URL "https://github.com/hunter-packages/libdill/archive/hunter-1.18.tar.gz" + SHA1 "447807f84cbd3369d3031b394e0941574e01b08a") +hunter_cmake_args(libdill CMAKE_ARGS + BUILD_TESTING=OFF + BUILD_PERF=OFF) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(libdill) +hunter_download(PACKAGE_NAME libdill) diff --git a/docs/packages/concurrency.rst b/docs/packages/concurrency.rst index ec6a05d160..4b4cabbdd0 100644 --- a/docs/packages/concurrency.rst +++ b/docs/packages/concurrency.rst @@ -4,6 +4,7 @@ HPC GPGPU GPU + libdill libmill Concurrency @@ -13,6 +14,7 @@ Concurrency - :ref:`pkg.Async++` - concurrency framework for C++11 - :ref:`pkg.BoostCompute` - :ref:`pkg.GPUImage` - open source iOS framework for GPU-based image and video processing + - :ref:`pkg.libdill` - C library that makes writing structured concurrent programs easy - :ref:`pkg.libmill` - Go-style concurrency in C - :ref:`pkg.ogles_gpgpu` - GPGPU for mobile devices and embedded systems using OpenGL ES 2.0 - :ref:`pkg.OpenCL` - OpenCL headers and Installable Client Driver diff --git a/docs/packages/pkg/libdill.rst b/docs/packages/pkg/libdill.rst new file mode 100644 index 0000000000..57ce8940e9 --- /dev/null +++ b/docs/packages/pkg/libdill.rst @@ -0,0 +1,21 @@ +.. spelling:: + + libdill + +.. index:: concurrency ; libdill + +.. _pkg.libdill: + +libdill +======= + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `Isaac Hier `__ (`pr-1063 `__) + +.. code-block:: cmake + + hunter_add_package(libdill) + find_package(libdill CONFIG REQUIRED) + target_link_libraries(libdill libdill::dill) diff --git a/examples/libdill/CMakeLists.txt b/examples/libdill/CMakeLists.txt new file mode 100644 index 0000000000..76309d354d --- /dev/null +++ b/examples/libdill/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.0) + +include("../common.cmake") + +project(download-libevent) + +hunter_add_package(libdill) + +find_package(libdill CONFIG REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main libdill::dill) diff --git a/examples/libdill/main.cpp b/examples/libdill/main.cpp new file mode 100644 index 0000000000..c5d397a1fa --- /dev/null +++ b/examples/libdill/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + return 0; +} From 78ca1c07ba573b0ab578821fed5bb0831e6983e1 Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Thu, 28 Sep 2017 13:14:40 -0400 Subject: [PATCH 2/6] Fix version. --- cmake/configs/default.cmake | 1 + cmake/projects/libdill/hunter.cmake | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index a2b209c339..e52367fc8b 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -201,6 +201,7 @@ hunter_config(ippicv VERSION 20151201) hunter_config(irrXML VERSION 1.2) hunter_config(kbproto VERSION 1.0.6) hunter_config(libdaemon VERSION 0.14) +hunter_config(libdill VERSION 1.6) hunter_config(libjson-rpc-cpp VERSION 0.7.0-p3) hunter_config(libmill VERSION 1.18) hunter_config(libogg VERSION 1.3.2-cmake3) diff --git a/cmake/projects/libdill/hunter.cmake b/cmake/projects/libdill/hunter.cmake index b8db5d9eb0..b08805ac91 100644 --- a/cmake/projects/libdill/hunter.cmake +++ b/cmake/projects/libdill/hunter.cmake @@ -8,9 +8,9 @@ include(hunter_pick_scheme) hunter_add_version( PACKAGE_NAME libdill - VERSION "1.18" - URL "https://github.com/hunter-packages/libdill/archive/hunter-1.18.tar.gz" - SHA1 "447807f84cbd3369d3031b394e0941574e01b08a") + VERSION "1.6" + URL "https://github.com/isaachier/libdill/archive/hunter-1.6-p0.tar.gz" + SHA1 "e583b83bee8305ceddcbfdcbd7cdcb29ec405110") hunter_cmake_args(libdill CMAKE_ARGS BUILD_TESTING=OFF BUILD_PERF=OFF) From 5d763bb72fbe1408efd332543613f02f12aabc82 Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Thu, 28 Sep 2017 14:52:29 -0400 Subject: [PATCH 3/6] Update version. --- cmake/projects/libdill/hunter.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/projects/libdill/hunter.cmake b/cmake/projects/libdill/hunter.cmake index b08805ac91..2ed21259c0 100644 --- a/cmake/projects/libdill/hunter.cmake +++ b/cmake/projects/libdill/hunter.cmake @@ -9,8 +9,8 @@ include(hunter_pick_scheme) hunter_add_version( PACKAGE_NAME libdill VERSION "1.6" - URL "https://github.com/isaachier/libdill/archive/hunter-1.6-p0.tar.gz" - SHA1 "e583b83bee8305ceddcbfdcbd7cdcb29ec405110") + URL "https://github.com/isaachier/libdill/archive/hunter-1.6-p1.tar.gz" + SHA1 "fa46951cca010b6a829b9d8aaf6a94a221cc7002") hunter_cmake_args(libdill CMAKE_ARGS BUILD_TESTING=OFF BUILD_PERF=OFF) From 0885535614d10db5a864334c3f6a0913b8b02cb9 Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Thu, 28 Sep 2017 14:57:16 -0400 Subject: [PATCH 4/6] Fix SHA1 hash. --- cmake/projects/libdill/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/libdill/hunter.cmake b/cmake/projects/libdill/hunter.cmake index 2ed21259c0..71dbfd1711 100644 --- a/cmake/projects/libdill/hunter.cmake +++ b/cmake/projects/libdill/hunter.cmake @@ -10,7 +10,7 @@ hunter_add_version( PACKAGE_NAME libdill VERSION "1.6" URL "https://github.com/isaachier/libdill/archive/hunter-1.6-p1.tar.gz" - SHA1 "fa46951cca010b6a829b9d8aaf6a94a221cc7002") + SHA1 "06a6aa00364007b2f19d942b503566bb15136a93") hunter_cmake_args(libdill CMAKE_ARGS BUILD_TESTING=OFF BUILD_PERF=OFF) From 44c6294a25bc4b0d18e314595dda8d5b145bbbca Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Wed, 4 Oct 2017 15:51:50 -0700 Subject: [PATCH 5/6] Fix pull request number --- docs/packages/pkg/libdill.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/libdill.rst b/docs/packages/pkg/libdill.rst index 57ce8940e9..ad88025703 100644 --- a/docs/packages/pkg/libdill.rst +++ b/docs/packages/pkg/libdill.rst @@ -12,7 +12,7 @@ libdill - `Official `__ - `Hunterized `__ - `Example `__ -- Added by `Isaac Hier `__ (`pr-1063 `__) +- Added by `Isaac Hier `__ (`pr-1069 `__) .. code-block:: cmake From aa0fd91e32c6a41b54ca24ef28078baca218376a Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Sun, 8 Oct 2017 12:00:25 -0400 Subject: [PATCH 6/6] Fix link to download libdill. --- cmake/projects/libdill/hunter.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/projects/libdill/hunter.cmake b/cmake/projects/libdill/hunter.cmake index 71dbfd1711..9287318529 100644 --- a/cmake/projects/libdill/hunter.cmake +++ b/cmake/projects/libdill/hunter.cmake @@ -9,8 +9,8 @@ include(hunter_pick_scheme) hunter_add_version( PACKAGE_NAME libdill VERSION "1.6" - URL "https://github.com/isaachier/libdill/archive/hunter-1.6-p1.tar.gz" - SHA1 "06a6aa00364007b2f19d942b503566bb15136a93") + URL "https://github.com/hunter-packages/libdill/archive/hunter-1.6.tar.gz" + SHA1 "603ca85ac4b0d9f0ab4f5db57281127370c5cacc") hunter_cmake_args(libdill CMAKE_ARGS BUILD_TESTING=OFF BUILD_PERF=OFF)