From bfbf82890b057fa66d614929d4fefeff062aeb4f Mon Sep 17 00:00:00 2001 From: Stefan Reinhold Date: Tue, 17 Jul 2018 15:14:17 +0200 Subject: [PATCH 1/8] Add Microsoft.GSL package --- cmake/configs/default.cmake | 1 + cmake/projects/Microsoft.GSL/hunter.cmake | 31 +++++++++++++++++++++++ docs/packages/pkg/Microsoft.GSL.rst | 21 +++++++++++++++ examples/Microsoft.GSL/CMakeLists.txt | 18 +++++++++++++ examples/Microsoft.GSL/boo.cpp | 4 +++ 5 files changed, 75 insertions(+) create mode 100644 cmake/projects/Microsoft.GSL/hunter.cmake create mode 100644 docs/packages/pkg/Microsoft.GSL.rst create mode 100644 examples/Microsoft.GSL/CMakeLists.txt create mode 100644 examples/Microsoft.GSL/boo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index c4afc82f9e..fe3c33d7dd 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -88,6 +88,7 @@ hunter_default_version(Libcxxabi VERSION 3.6.2) # Clang hunter_default_version(Libevent VERSION 2.1.8-p4) hunter_default_version(Libssh2 VERSION 1.7.0) hunter_default_version(Lua VERSION 5.3.2-p2) +hunter_default_version(Microsoft.GSL VERSION 1.0.0) hunter_default_version(MySQL-client VERSION 6.1.9-p0) hunter_default_version(NASM VERSION 2.12.02) hunter_default_version(OpenAL VERSION 1.18.2) diff --git a/cmake/projects/Microsoft.GSL/hunter.cmake b/cmake/projects/Microsoft.GSL/hunter.cmake new file mode 100644 index 0000000000..ce88e2c6f2 --- /dev/null +++ b/cmake/projects/Microsoft.GSL/hunter.cmake @@ -0,0 +1,31 @@ +# Copyright (c) 2016-2018, Ruslan Baratov +# All rights reserved. + +# !!! 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 + Microsoft.GSL + VERSION + 1.0.0 + URL + "https://github.com/ithron/GSL/archive/v1.0.0-h.tar.gz" + SHA1 + bbbf0e613e54055dff6745cfda42d6b0820233be +) + +hunter_cmake_args( + Microsoft.GSL + CMAKE_ARGS + GSL_TEST=OFF +) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(Microsoft.GSL) +hunter_download(PACKAGE_NAME Microsoft.GSL) diff --git a/docs/packages/pkg/Microsoft.GSL.rst b/docs/packages/pkg/Microsoft.GSL.rst new file mode 100644 index 0000000000..f4151e097d --- /dev/null +++ b/docs/packages/pkg/Microsoft.GSL.rst @@ -0,0 +1,21 @@ +.. spelling:: + + Microsoft.GSL + +.. index:: + single: unsorted ; Microsoft.GSL + +.. _pkg.Microsoft.GSL: + +Microsoft.GSL +=== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `Stefan Reinhold `__ (`pr-N `__) + +.. literalinclude:: /../examples/Microsoft.GSL/CMakeLists.txt + :language: cmake + :start-after: # DOCUMENTATION_START { + :end-before: # DOCUMENTATION_END } diff --git a/examples/Microsoft.GSL/CMakeLists.txt b/examples/Microsoft.GSL/CMakeLists.txt new file mode 100644 index 0000000000..052e0a7d97 --- /dev/null +++ b/examples/Microsoft.GSL/CMakeLists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2016-2018, Ruslan Baratov +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-Microsoft.GSL) + +# DOCUMENTATION_START { +hunter_add_package(Microsoft.GSL) +find_package(Microsoft.GSL CONFIG REQUIRED) + +add_executable(boo boo.cpp) +target_link_libraries(boo PUBLIC Microsoft.GSL::GSL) +# DOCUMENTATION_END } diff --git a/examples/Microsoft.GSL/boo.cpp b/examples/Microsoft.GSL/boo.cpp new file mode 100644 index 0000000000..6ed828fa43 --- /dev/null +++ b/examples/Microsoft.GSL/boo.cpp @@ -0,0 +1,4 @@ +#include + +int main() { +} From d3c41e9eb19954a6dda9f7d6452b96119ee0fdd5 Mon Sep 17 00:00:00 2001 From: Stefan Reinhold Date: Wed, 18 Jul 2018 11:42:15 +0200 Subject: [PATCH 2/8] Fix SHA1 --- cmake/projects/Microsoft.GSL/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/Microsoft.GSL/hunter.cmake b/cmake/projects/Microsoft.GSL/hunter.cmake index ce88e2c6f2..2b8b04595c 100644 --- a/cmake/projects/Microsoft.GSL/hunter.cmake +++ b/cmake/projects/Microsoft.GSL/hunter.cmake @@ -17,7 +17,7 @@ hunter_add_version( URL "https://github.com/ithron/GSL/archive/v1.0.0-h.tar.gz" SHA1 - bbbf0e613e54055dff6745cfda42d6b0820233be + 1a549e0261a10484f8e5a8d9c691c62b5b9aa639 ) hunter_cmake_args( From fb719294fbbd11c93969f00b995d64eae8c77900 Mon Sep 17 00:00:00 2001 From: Stefan Reinhold Date: Wed, 18 Jul 2018 12:03:19 +0200 Subject: [PATCH 3/8] Pull request number --- docs/packages/pkg/Microsoft.GSL.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/Microsoft.GSL.rst b/docs/packages/pkg/Microsoft.GSL.rst index f4151e097d..d5f96e4578 100644 --- a/docs/packages/pkg/Microsoft.GSL.rst +++ b/docs/packages/pkg/Microsoft.GSL.rst @@ -13,7 +13,7 @@ Microsoft.GSL - `Official `__ - `Hunterized `__ - `Example `__ -- Added by `Stefan Reinhold `__ (`pr-N `__) +- Added by `Stefan Reinhold `__ (`pr-1499 `__) .. literalinclude:: /../examples/Microsoft.GSL/CMakeLists.txt :language: cmake From c29c100d0fe62e275d5b196d2a5df7d6a53369b5 Mon Sep 17 00:00:00 2001 From: Stefan Reinhold Date: Wed, 18 Jul 2018 12:08:32 +0200 Subject: [PATCH 4/8] Change === to ============= --- docs/packages/pkg/Microsoft.GSL.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/Microsoft.GSL.rst b/docs/packages/pkg/Microsoft.GSL.rst index d5f96e4578..b2cc9b283d 100644 --- a/docs/packages/pkg/Microsoft.GSL.rst +++ b/docs/packages/pkg/Microsoft.GSL.rst @@ -8,7 +8,7 @@ .. _pkg.Microsoft.GSL: Microsoft.GSL -=== +============= - `Official `__ - `Hunterized `__ From 68139b5d617223d42e84478b7c7e07494691506b Mon Sep 17 00:00:00 2001 From: Stefan Reinhold Date: Thu, 19 Jul 2018 15:16:10 +0200 Subject: [PATCH 5/8] Changed URL to point to hunter-packages fork --- cmake/projects/Microsoft.GSL/hunter.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/projects/Microsoft.GSL/hunter.cmake b/cmake/projects/Microsoft.GSL/hunter.cmake index 2b8b04595c..34cf78f19a 100644 --- a/cmake/projects/Microsoft.GSL/hunter.cmake +++ b/cmake/projects/Microsoft.GSL/hunter.cmake @@ -15,9 +15,9 @@ hunter_add_version( VERSION 1.0.0 URL - "https://github.com/ithron/GSL/archive/v1.0.0-h.tar.gz" + "https://github.com/hunter-packages/Microsoft.GSL/archive/v1.0.0-p0.tar.gz" SHA1 - 1a549e0261a10484f8e5a8d9c691c62b5b9aa639 + 3cc3b9f2f7e5cde7827b8793ab6b4a8717511c9a ) hunter_cmake_args( From 996b82f03fcf30b1571bead37eae672a9d35effe Mon Sep 17 00:00:00 2001 From: Stefan Reinhold Date: Thu, 19 Jul 2018 15:32:12 +0200 Subject: [PATCH 6/8] Change version to 1.0.0-p0 --- cmake/projects/Microsoft.GSL/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/Microsoft.GSL/hunter.cmake b/cmake/projects/Microsoft.GSL/hunter.cmake index 34cf78f19a..8202a0f3de 100644 --- a/cmake/projects/Microsoft.GSL/hunter.cmake +++ b/cmake/projects/Microsoft.GSL/hunter.cmake @@ -13,7 +13,7 @@ hunter_add_version( PACKAGE_NAME Microsoft.GSL VERSION - 1.0.0 + 1.0.0-p0 URL "https://github.com/hunter-packages/Microsoft.GSL/archive/v1.0.0-p0.tar.gz" SHA1 From 31ac01ac37f4f1a208f3c3de96d58ebf1dc3c98e Mon Sep 17 00:00:00 2001 From: Stefan Reinhold Date: Thu, 19 Jul 2018 15:50:29 +0200 Subject: [PATCH 7/8] Fix hunterized link in documentation --- docs/packages/pkg/Microsoft.GSL.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/Microsoft.GSL.rst b/docs/packages/pkg/Microsoft.GSL.rst index b2cc9b283d..fc453ff3f2 100644 --- a/docs/packages/pkg/Microsoft.GSL.rst +++ b/docs/packages/pkg/Microsoft.GSL.rst @@ -11,7 +11,7 @@ Microsoft.GSL ============= - `Official `__ -- `Hunterized `__ +- `Hunterized `__ - `Example `__ - Added by `Stefan Reinhold `__ (`pr-1499 `__) From 3102368094449301c9a591fe0c054db820279a31 Mon Sep 17 00:00:00 2001 From: Stefan Reinhold Date: Thu, 19 Jul 2018 15:59:36 +0200 Subject: [PATCH 8/8] Fix default version --- cmake/configs/default.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index fe3c33d7dd..eaa86c4005 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -88,7 +88,7 @@ hunter_default_version(Libcxxabi VERSION 3.6.2) # Clang hunter_default_version(Libevent VERSION 2.1.8-p4) hunter_default_version(Libssh2 VERSION 1.7.0) hunter_default_version(Lua VERSION 5.3.2-p2) -hunter_default_version(Microsoft.GSL VERSION 1.0.0) +hunter_default_version(Microsoft.GSL VERSION 1.0.0-p0) hunter_default_version(MySQL-client VERSION 6.1.9-p0) hunter_default_version(NASM VERSION 2.12.02) hunter_default_version(OpenAL VERSION 1.18.2)