From 49e7658df4a178f7edad6bfef9579cd486cf148f Mon Sep 17 00:00:00 2001 From: Joerg-Christian Boehme Date: Mon, 20 Jan 2020 12:09:54 +0100 Subject: [PATCH 1/4] Initial commit --- cmake/projects/scelta/hunter.cmake | 42 ++++++++++++++++++++++++++++++ docs/packages/pkg/scelta.rst | 21 +++++++++++++++ examples/scelta/CMakeLists.txt | 18 +++++++++++++ examples/scelta/boo.cpp | 4 +++ 4 files changed, 85 insertions(+) create mode 100644 cmake/projects/scelta/hunter.cmake create mode 100644 docs/packages/pkg/scelta.rst create mode 100644 examples/scelta/CMakeLists.txt create mode 100644 examples/scelta/boo.cpp diff --git a/cmake/projects/scelta/hunter.cmake b/cmake/projects/scelta/hunter.cmake new file mode 100644 index 0000000000..37fa953f74 --- /dev/null +++ b/cmake/projects/scelta/hunter.cmake @@ -0,0 +1,42 @@ +# !!! 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 + scelta + VERSION + 1.0.0 + URL + "https://github.com/hunter-packages/foo/archive/v1.0.0.tar.gz" + SHA1 + 1111111111111111111111111111111111111111 +) + +#if (ANDROID OR IOS) +# hunter_cmake_args( +# scelta +# CMAKE_ARGS +# PKGCONFIG_EXPORT_TARGETS=libfoo;libbar +# DEPENDS_ON_PACKAGES=foo;bar +# EXTRA_FLAGS=--enable-bots +# ) +#endif() + +#hunter_configuration_types(scelta CONFIGURATION_TYPES Release) +hunter_pick_scheme(DEFAULT url_sha1_autotools) +hunter_cacheable(scelta) +hunter_download( + PACKAGE_NAME scelta + PACKAGE_INTERNAL_DEPS_ID "1" +# PACKAGE_UNRELOCATABLE_TEXT_FILES +# "lib/libfoo.la" +# "lib/libpbar.la" +# "lib/pkgconfig/libfoo.pc" +# "lib/pkgconfig/libpbar.pc" +) diff --git a/docs/packages/pkg/scelta.rst b/docs/packages/pkg/scelta.rst new file mode 100644 index 0000000000..803f9823de --- /dev/null +++ b/docs/packages/pkg/scelta.rst @@ -0,0 +1,21 @@ +.. spelling:: + + scelta + +.. index:: + single: unsorted ; scelta + +.. _pkg.scelta: + +scelta +=== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `Joerg-Christian Boehme `__ (`pr-N `__) + +.. literalinclude:: /../examples/scelta/CMakeLists.txt + :language: cmake + :start-after: # DOCUMENTATION_START { + :end-before: # DOCUMENTATION_END } diff --git a/examples/scelta/CMakeLists.txt b/examples/scelta/CMakeLists.txt new file mode 100644 index 0000000000..d351acaeeb --- /dev/null +++ b/examples/scelta/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(scelta) + +# DOCUMENTATION_START { +hunter_add_package(scelta) +find_package(scelta CONFIG REQUIRED) + +add_executable(boo boo.cpp) +target_link_libraries(boo PUBLIC PkgConfig::scelta) +# DOCUMENTATION_END } diff --git a/examples/scelta/boo.cpp b/examples/scelta/boo.cpp new file mode 100644 index 0000000000..0ed0fa43b3 --- /dev/null +++ b/examples/scelta/boo.cpp @@ -0,0 +1,4 @@ +#include + +int main() { +} From 9f872d0fb286e6df51b523e895c9dc30f22912e6 Mon Sep 17 00:00:00 2001 From: Joerg-Christian Boehme Date: Mon, 20 Jan 2020 12:26:55 +0100 Subject: [PATCH 2/4] First version of scelta --- cmake/configs/default.cmake | 1 + cmake/projects/scelta/hunter.cmake | 8 ++++---- docs/packages/pkg/scelta.rst | 8 ++++---- examples/scelta/CMakeLists.txt | 2 +- examples/scelta/boo.cpp | 4 +++- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index bd97ac022f..020c62bb94 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -460,6 +460,7 @@ hunter_default_version(rosconsole VERSION 1.13.10-p0) hunter_default_version(roscpp_core VERSION 0.6.12-p0) hunter_default_version(rospack VERSION 2.5.3-p0) hunter_default_version(s3 VERSION 0.0.0-287e4be-p1) +hunter_default_version(scelta VERSION 0.1.0-a0f4f70) hunter_default_version(sds VERSION 2.0.0) hunter_default_version(sentencepiece VERSION 0.1.8-p1) hunter_default_version(shaderc VERSION 2019.0-p1) diff --git a/cmake/projects/scelta/hunter.cmake b/cmake/projects/scelta/hunter.cmake index 37fa953f74..1b7557063d 100644 --- a/cmake/projects/scelta/hunter.cmake +++ b/cmake/projects/scelta/hunter.cmake @@ -11,11 +11,11 @@ hunter_add_version( PACKAGE_NAME scelta VERSION - 1.0.0 + 0.1.0-a0f4f70 URL - "https://github.com/hunter-packages/foo/archive/v1.0.0.tar.gz" + "https://github.com/Bjoe/scelta/archive/594aed957f4c2867243c08b73af49ef4d4599520.tar.gz" SHA1 - 1111111111111111111111111111111111111111 + 5a0fc037df80027af09de094875af8cac9b8d19f ) #if (ANDROID OR IOS) @@ -29,7 +29,7 @@ hunter_add_version( #endif() #hunter_configuration_types(scelta CONFIGURATION_TYPES Release) -hunter_pick_scheme(DEFAULT url_sha1_autotools) +hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(scelta) hunter_download( PACKAGE_NAME scelta diff --git a/docs/packages/pkg/scelta.rst b/docs/packages/pkg/scelta.rst index 803f9823de..6c76f1640e 100644 --- a/docs/packages/pkg/scelta.rst +++ b/docs/packages/pkg/scelta.rst @@ -8,12 +8,12 @@ .. _pkg.scelta: scelta -=== +====== -- `Official `__ -- `Hunterized `__ +- `Official `__ +- `Hunterized `__ - `Example `__ -- Added by `Joerg-Christian Boehme `__ (`pr-N `__) +- Added by `Joerg-Christian Boehme `__ (`pr-N `__) .. literalinclude:: /../examples/scelta/CMakeLists.txt :language: cmake diff --git a/examples/scelta/CMakeLists.txt b/examples/scelta/CMakeLists.txt index d351acaeeb..5426bb17c5 100644 --- a/examples/scelta/CMakeLists.txt +++ b/examples/scelta/CMakeLists.txt @@ -14,5 +14,5 @@ hunter_add_package(scelta) find_package(scelta CONFIG REQUIRED) add_executable(boo boo.cpp) -target_link_libraries(boo PUBLIC PkgConfig::scelta) +target_link_libraries(boo PUBLIC scelta::headers) # DOCUMENTATION_END } diff --git a/examples/scelta/boo.cpp b/examples/scelta/boo.cpp index 0ed0fa43b3..5568eab683 100644 --- a/examples/scelta/boo.cpp +++ b/examples/scelta/boo.cpp @@ -1,4 +1,6 @@ -#include +#include +#include int main() { + scelta::match(); } From c6ccdd4086b2e047dd3c11cefde5adb8744a754a Mon Sep 17 00:00:00 2001 From: Joerg-Christian Boehme Date: Mon, 27 Jan 2020 11:44:39 +0100 Subject: [PATCH 3/4] Add new scelta version and fix findings --- cmake/projects/scelta/hunter.cmake | 24 +++--------------------- docs/packages/pkg/scelta.rst | 2 +- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/cmake/projects/scelta/hunter.cmake b/cmake/projects/scelta/hunter.cmake index 1b7557063d..7b439947a6 100644 --- a/cmake/projects/scelta/hunter.cmake +++ b/cmake/projects/scelta/hunter.cmake @@ -2,8 +2,6 @@ include(hunter_add_version) include(hunter_cacheable) -#include(hunter_cmake_args) -#include(hunter_configuration_types) include(hunter_download) include(hunter_pick_scheme) @@ -11,32 +9,16 @@ hunter_add_version( PACKAGE_NAME scelta VERSION - 0.1.0-a0f4f70 + 0.1.0-a0f4f70-p0 URL - "https://github.com/Bjoe/scelta/archive/594aed957f4c2867243c08b73af49ef4d4599520.tar.gz" + "https://github.com/cpp-pm/scelta/archive/v0.1-a0f4f70-p0.tar.gz" SHA1 - 5a0fc037df80027af09de094875af8cac9b8d19f + 2b5abc5e577687757f4cc37d702e5903fb143a9a ) -#if (ANDROID OR IOS) -# hunter_cmake_args( -# scelta -# CMAKE_ARGS -# PKGCONFIG_EXPORT_TARGETS=libfoo;libbar -# DEPENDS_ON_PACKAGES=foo;bar -# EXTRA_FLAGS=--enable-bots -# ) -#endif() - -#hunter_configuration_types(scelta CONFIGURATION_TYPES Release) hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(scelta) hunter_download( PACKAGE_NAME scelta PACKAGE_INTERNAL_DEPS_ID "1" -# PACKAGE_UNRELOCATABLE_TEXT_FILES -# "lib/libfoo.la" -# "lib/libpbar.la" -# "lib/pkgconfig/libfoo.pc" -# "lib/pkgconfig/libpbar.pc" ) diff --git a/docs/packages/pkg/scelta.rst b/docs/packages/pkg/scelta.rst index 6c76f1640e..76083f12ad 100644 --- a/docs/packages/pkg/scelta.rst +++ b/docs/packages/pkg/scelta.rst @@ -13,7 +13,7 @@ scelta - `Official `__ - `Hunterized `__ - `Example `__ -- Added by `Joerg-Christian Boehme `__ (`pr-N `__) +- Added by `Joerg-Christian Boehme `__ (`pr-142 `__) .. literalinclude:: /../examples/scelta/CMakeLists.txt :language: cmake From fb9cb4940496b22a4a483c7c6ab04c8b4602c322 Mon Sep 17 00:00:00 2001 From: Joerg-Christian Boehme Date: Tue, 28 Jan 2020 06:16:47 +0100 Subject: [PATCH 4/4] Update 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 020c62bb94..36375422f7 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -460,7 +460,7 @@ hunter_default_version(rosconsole VERSION 1.13.10-p0) hunter_default_version(roscpp_core VERSION 0.6.12-p0) hunter_default_version(rospack VERSION 2.5.3-p0) hunter_default_version(s3 VERSION 0.0.0-287e4be-p1) -hunter_default_version(scelta VERSION 0.1.0-a0f4f70) +hunter_default_version(scelta VERSION 0.1.0-a0f4f70-p0) hunter_default_version(sds VERSION 2.0.0) hunter_default_version(sentencepiece VERSION 0.1.8-p1) hunter_default_version(shaderc VERSION 2019.0-p1)