From 570bfcfd31de257aa30257bed9fe2a5be1d17d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Fri, 22 Sep 2017 17:46:09 +0200 Subject: [PATCH 0001/1014] upload-cache-to-github.py: Use upload URL received from GitHub --- maintenance/upload-cache-to-github.py | 32 +++++++++++++++------------ 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/maintenance/upload-cache-to-github.py b/maintenance/upload-cache-to-github.py index a2da9af6a1..a2d52b28dc 100755 --- a/maintenance/upload-cache-to-github.py +++ b/maintenance/upload-cache-to-github.py @@ -71,6 +71,7 @@ def __init__(self, username, password, repo_owner, repo): self.auth = requests.auth.HTTPBasicAuth(username, password) self.simple_request() self.release_id = None + self.upload_url = None @retry def simple_request(self): @@ -101,11 +102,19 @@ def get_release_by_tag(self, tagname): if r.status_code == 404: raise Error('Release {} does not exist. Create a GitHub release for with this tag'.format(tagname)) if not r.ok: - raise Exception('Get tag id failed. Requested url: {}'.format(url)) - - tag_id = r.json()['id'] - print('Tag id is {}'.format(tag_id)) - return tag_id + raise Exception( + 'Get release id failed. Status code: {}. Requested url: {}'.format( + r.status_code, url)) + + release_id = r.json()['id'] + upload_url = r.json()['upload_url'] + uri_template_vars = '{?name,label}' + if uri_template_vars not in upload_url: + raise Exception('Unsupported upload URI template: {}'.format(upload_url)) + upload_url = upload_url.replace(uri_template_vars, '?name={}') + print('Release id: {}'.format(release_id)) + print('Upload URL: {}'.format(upload_url)) + return release_id, upload_url @retry def find_asset_id_by_name(self, release_id, name): @@ -185,21 +194,16 @@ def upload_bzip(self, url, local_path, release_id, asset_name): def upload_raw_file(self, local_path): tagname = 'cache' if self.release_id is None: - self.release_id = self.get_release_by_tag(tagname) + self.release_id, self.upload_url = self.get_release_by_tag(tagname) # https://developer.github.com/v3/repos/releases/#upload-a-release-asset - # POST https:///repos/:owner/:repo/releases/:id/assets?name=foo.zip + # POST to upload_url received in the release description + # in get_release_by_tag() asset_name = hashlib.sha1(open(local_path, 'rb').read()).hexdigest() asset_name = asset_name + '.tar.bz2' - url = 'https://uploads.github.com/repos/{}/{}/releases/{}/assets?name={}'.format( - self.repo_owner, - self.repo, - self.release_id, - asset_name - ) - + url = self.upload_url.format(asset_name) self.upload_bzip(url, local_path, self.release_id, asset_name) @retry From f4fa5940c5b4fd6a7fc87a443e24cdcded74bd1e Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 23 Sep 2017 15:46:51 +0300 Subject: [PATCH 0002/1014] Qt: PKG_CONFIG_PATH for build stage Component QtMultimedia can run checks on build stage --- cmake/projects/Qt/ep-stages/qt-build.cmake.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cmake/projects/Qt/ep-stages/qt-build.cmake.in b/cmake/projects/Qt/ep-stages/qt-build.cmake.in index d4bf430cbe..c4e631108c 100644 --- a/cmake/projects/Qt/ep-stages/qt-build.cmake.in +++ b/cmake/projects/Qt/ep-stages/qt-build.cmake.in @@ -7,6 +7,11 @@ if(is_empty) message(FATAL_ERROR "hunter_self is empty") endif() +string(COMPARE EQUAL "@global_install_dir@" "" is_empty) +if(is_empty) + message(FATAL_ERROR "global_install_dir is empty") +endif() + if("@MSVC@") set(build_command nmake) elseif("@MINGW@") @@ -21,6 +26,13 @@ if("@ANDROID@") set(ENV{ANDROID_API_VERSION} "@ANDROID_API_VERSION@") endif() +# QtMultimedia can run more checks +if("@HUNTER_QT_OS_IS_LINUX@") + set(x "@global_install_dir@/share/pkgconfig") + set(y "@global_install_dir@/lib/pkgconfig") + set(ENV{PKG_CONFIG_PATH} "${x}:${y}") +endif() + execute_process(COMMAND ${build_command} @build_opts@ RESULT_VARIABLE result) if(NOT result EQUAL 0) From 7effff9e0e19e909d128d63fabacf228d6d3aa81 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 23 Sep 2017 15:49:58 +0300 Subject: [PATCH 0003/1014] Autotools: Set LD_LIBRARY_PATH --- cmake/modules/hunter_autotools_project.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/modules/hunter_autotools_project.cmake b/cmake/modules/hunter_autotools_project.cmake index 69f1536881..0e6186603c 100644 --- a/cmake/modules/hunter_autotools_project.cmake +++ b/cmake/modules/hunter_autotools_project.cmake @@ -111,6 +111,8 @@ function(hunter_autotools_project target_name) set(default_path "/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin") set(shell_env_path "PATH=${PARAM_GLOBAL_INSTALL_DIR}/bin:${default_path}") + set(shell_ld_path "LD_LIBRARY_PATH=${PARAM_GLOBAL_INSTALL_DIR}/lib") + set(d1 "${PARAM_GLOBAL_INSTALL_DIR}/lib/pkgconfig") set(d2 "${PARAM_GLOBAL_INSTALL_DIR}/share/pkgconfig") set(shell_pkg_config_libdir "PKG_CONFIG_LIBDIR=${d1}:${d2}") @@ -123,6 +125,7 @@ function(hunter_autotools_project target_name) && ${shell_env_path} ${shell_pkg_config_libdir} + ${shell_ld_path} ) # Build command and options From d865605029649ab17f3fe0da0a1fda7a8218039b Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 23 Sep 2017 15:52:03 +0300 Subject: [PATCH 0004/1014] Qt: Add option QT_WITH_GSTREAMER --- .../projects/Qt/schemes/url_sha1_qt.cmake.in | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/cmake/projects/Qt/schemes/url_sha1_qt.cmake.in b/cmake/projects/Qt/schemes/url_sha1_qt.cmake.in index 729609db3b..115cd0ebef 100644 --- a/cmake/projects/Qt/schemes/url_sha1_qt.cmake.in +++ b/cmake/projects/Qt/schemes/url_sha1_qt.cmake.in @@ -144,12 +144,18 @@ elseif(_is_darwin) set(HUNTER_PATCH_QT_MACX_CLANG TRUE) elseif(_is_linux) set(HUNTER_QT_OS_IS_LINUX TRUE) - hunter_add_package(xcb) + hunter_add_package(drm) + hunter_add_package(ice) + hunter_add_package(sm) hunter_add_package(x11) + hunter_add_package(xcb) + hunter_add_package(xcursor) + hunter_add_package(xdamage) hunter_add_package(xext) + hunter_add_package(xfixes) hunter_add_package(xrender) - hunter_add_package(sm) - hunter_add_package(ice) + hunter_add_package(xshmfence) + hunter_add_package(xxf86vm) string(COMPARE EQUAL "${X11_ROOT}" "${XCB_ROOT}" is_good) if(NOT is_good) @@ -193,6 +199,14 @@ elseif("@MINGW@") list(APPEND configure_opts -opengl "desktop") endif() +if(QT_WITH_GSTREAMER) + hunter_add_package(gst_plugins_bad) + hunter_add_package(gst_plugins_good) + hunter_add_package(gst_plugins_ugly) + + list(APPEND configure_opts -gstreamer 1.0) +endif() + if(HUNTER_STATUS_DEBUG AND NOT WIN32) list(APPEND configure_opts "-verbose") endif() @@ -381,6 +395,8 @@ configure_file( # * is_release_debug # * is_release # * is_debug +# * global_install_dir +# * HUNTER_QT_OS_IS_LINUX configure_file( "@HUNTER_PACKAGE_SETUP_DIR@/ep-stages/qt-build.cmake.in" "@HUNTER_PACKAGE_BUILD_DIR@/qt-build.cmake" From 6fd8d2c597622d45c207ece931aa831e4637571f Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 23 Sep 2017 16:23:45 +0300 Subject: [PATCH 0005/1014] ice: Fix list of dependencies --- cmake/projects/ice/hunter.cmake | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cmake/projects/ice/hunter.cmake b/cmake/projects/ice/hunter.cmake index d5bce7c8eb..7dfb007426 100644 --- a/cmake/projects/ice/hunter.cmake +++ b/cmake/projects/ice/hunter.cmake @@ -24,14 +24,10 @@ hunter_add_version( hunter_configuration_types(ice CONFIGURATION_TYPES Release) hunter_pick_scheme(DEFAULT url_sha1_autotools) -set(x11_dependencies - xproto - xtrans -) hunter_cmake_args( - x11 - CMAKE_ARGS # do not use double quotes on CMAKE_ARGS - DEPENDS_ON_PACKAGES=${x11_dependencies} + ice + CMAKE_ARGS + DEPENDS_ON_PACKAGES=xproto;xtrans ) hunter_cacheable(ice) hunter_download( From ec339d02f2e1322886300ea0a326ab471e4cd6f0 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 23 Sep 2017 20:32:52 +0300 Subject: [PATCH 0006/1014] Add 'libogg' example --- cmake/projects/libogg/hunter.cmake | 13 +++++++++---- examples/libogg/CMakeLists.txt | 16 ++++++++++++++++ examples/libogg/foo.cpp | 4 ++++ 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 examples/libogg/CMakeLists.txt create mode 100644 examples/libogg/foo.cpp diff --git a/cmake/projects/libogg/hunter.cmake b/cmake/projects/libogg/hunter.cmake index 714568c5fd..cb74924e78 100644 --- a/cmake/projects/libogg/hunter.cmake +++ b/cmake/projects/libogg/hunter.cmake @@ -1,4 +1,5 @@ include(hunter_add_version) +include(hunter_cacheable) include(hunter_download) include(hunter_pick_scheme) @@ -10,10 +11,14 @@ hunter_add_version( URL "https://github.com/Meralis40/ogg/archive/v1.3.2-cmake3.tar.gz" SHA1 - 2640E75997765339BA06BE0E4BFA66D85B70636A + 646672cabc9eec253c9199a872541e3a182f6062 ) hunter_pick_scheme(DEFAULT url_sha1_cmake) - -hunter_download(PACKAGE_NAME libogg) - +hunter_cacheable(libogg) +hunter_download( + PACKAGE_NAME + libogg + PACKAGE_UNRELOCATABLE_TEXT_FILES + "lib/pkgconfig/ogg.pc" +) diff --git a/examples/libogg/CMakeLists.txt b/examples/libogg/CMakeLists.txt new file mode 100644 index 0000000000..bcfcf51187 --- /dev/null +++ b/examples/libogg/CMakeLists.txt @@ -0,0 +1,16 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-libogg) + +hunter_add_package(libogg) +find_package(libogg CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo libogg::ogg) diff --git a/examples/libogg/foo.cpp b/examples/libogg/foo.cpp new file mode 100644 index 0000000000..8e8e7a07d7 --- /dev/null +++ b/examples/libogg/foo.cpp @@ -0,0 +1,4 @@ +// #include (FIXME) + +int main() { +} From ef5abeee3416ec1fd7e7dded528dc5937acb7686 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 23 Sep 2017 21:11:31 +0300 Subject: [PATCH 0007/1014] gst_plugins_base: Install gstogg/gstximagesink --- cmake/projects/gst_plugins_base/hunter.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/projects/gst_plugins_base/hunter.cmake b/cmake/projects/gst_plugins_base/hunter.cmake index 16761e7a08..be7d88f2d9 100644 --- a/cmake/projects/gst_plugins_base/hunter.cmake +++ b/cmake/projects/gst_plugins_base/hunter.cmake @@ -45,7 +45,7 @@ endforeach() hunter_cmake_args( gst_plugins_base CMAKE_ARGS - DEPENDS_ON_PACKAGES=gstreamer + DEPENDS_ON_PACKAGES=gstreamer;libogg;x11 DEPENDS_ON_PKGCONFIGS=gstreamer-1.0 PKGCONFIG_EXPORT_TARGETS=${_gst_export_targets} ) @@ -67,6 +67,7 @@ hunter_download( "lib/gstreamer-1.0/libgstaudiotestsrc.la" "lib/gstreamer-1.0/libgstencodebin.la" "lib/gstreamer-1.0/libgstgio.la" + "lib/gstreamer-1.0/libgstogg.la" "lib/gstreamer-1.0/libgstplayback.la" "lib/gstreamer-1.0/libgstsubparse.la" "lib/gstreamer-1.0/libgsttcp.la" @@ -76,6 +77,7 @@ hunter_download( "lib/gstreamer-1.0/libgstvideoscale.la" "lib/gstreamer-1.0/libgstvideotestsrc.la" "lib/gstreamer-1.0/libgstvolume.la" + "lib/gstreamer-1.0/libgstximagesink.la" "lib/libgstallocators-1.0.la" "lib/libgstapp-1.0.la" "lib/libgstaudio-1.0.la" From af41ae9dbed136bf784ffcefca3f981b4e72232e Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 23 Sep 2017 21:12:43 +0300 Subject: [PATCH 0008/1014] 'gst_plugins_good' depends on 'xext' --- cmake/projects/gst_plugins_good/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/gst_plugins_good/hunter.cmake b/cmake/projects/gst_plugins_good/hunter.cmake index 08df06e653..0269214693 100644 --- a/cmake/projects/gst_plugins_good/hunter.cmake +++ b/cmake/projects/gst_plugins_good/hunter.cmake @@ -24,7 +24,7 @@ hunter_add_version( hunter_cmake_args( gst_plugins_good CMAKE_ARGS - DEPENDS_ON_PACKAGES=gst_plugins_base + DEPENDS_ON_PACKAGES=gst_plugins_base;xext DEPENDS_ON_PKGCONFIGS=gstreamer-plugins-base-1.0 # ??? ) From 8ba60e6440ccfe10adf422ec7f6fff1463b0d9b5 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 23 Sep 2017 22:10:08 +0300 Subject: [PATCH 0009/1014] qt-camera: Add test for Linux --- examples/qt-camera/CMakeLists.txt | 27 ++++++++++++++++++ examples/qt-camera/config.cmake | 46 +++++++++++++++++++++++++++++++ examples/qt-camera/env.sh | 4 +++ examples/qt-camera/qt.conf | 3 ++ 4 files changed, 80 insertions(+) create mode 100644 examples/qt-camera/config.cmake create mode 100644 examples/qt-camera/env.sh create mode 100644 examples/qt-camera/qt.conf diff --git a/examples/qt-camera/CMakeLists.txt b/examples/qt-camera/CMakeLists.txt index d05ef8c17d..f15519ca70 100644 --- a/examples/qt-camera/CMakeLists.txt +++ b/examples/qt-camera/CMakeLists.txt @@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.0) +set(TESTING_CONFIG_OPT FILEPATH "${CMAKE_CURRENT_LIST_DIR}/config.cmake") + # Emulate HunterGate: # * https://github.com/hunter-packages/gate include("../common.cmake") @@ -127,3 +129,28 @@ if(fix_cyclic) ) endif() # -- + +string(COMPARE EQUAL "${CMAKE_SYSTEM_NAME}" "Linux" is_linux) + +if(is_linux) + configure_file( + qt.conf + ${CMAKE_CURRENT_BINARY_DIR}/qt.conf + @ONLY + ) + + configure_file( + env.sh + ${CMAKE_CURRENT_BINARY_DIR}/env.sh + @ONLY + ) + + enable_testing() + add_test(NAME qt-camera COMMAND qt-camera) + set_tests_properties( + qt-camera + PROPERTIES + ENVIRONMENT + "QT_DEBUG_PLUGINS=1;LD_LIBRARY_PATH=${QT_ROOT}/lib;GST_PLUGIN_SCANNER=1;GST_PLUGIN_PATH=${QT_ROOT}/lib/gstreamer-1.0" + ) +endif() diff --git a/examples/qt-camera/config.cmake b/examples/qt-camera/config.cmake new file mode 100644 index 0000000000..9777553535 --- /dev/null +++ b/examples/qt-camera/config.cmake @@ -0,0 +1,46 @@ +string(COMPARE EQUAL "${CMAKE_SYSTEM_NAME}" "Linux" is_linux) + +if(is_linux) + set( + dependencies + drm + glib + gst_plugins_bad + gst_plugins_base + gst_plugins_good + gst_plugins_ugly + gstreamer + ice + libffi + libogg + libpcre + pciaccess + sm + util_linux + x11 + xau + xcb + xcursor + xdamage + xext + xfixes + xrender + xshmfence + xxf86vm + ) + foreach(pkg ${dependencies}) + hunter_config( + ${pkg} + VERSION ${HUNTER_${pkg}_VERSION} + CMAKE_ARGS BUILD_SHARED_LIBS=ON + ) + endforeach() + + hunter_config( + Qt + VERSION ${HUNTER_Qt_VERSION} + CMAKE_ARGS + QT_WITH_GSTREAMER=ON + BUILD_SHARED_LIBS=ON + ) +endif() diff --git a/examples/qt-camera/env.sh b/examples/qt-camera/env.sh new file mode 100644 index 0000000000..f8d57b8f90 --- /dev/null +++ b/examples/qt-camera/env.sh @@ -0,0 +1,4 @@ +export GST_PLUGIN_PATH=@QT_ROOT@/lib/gstreamer-1.0 +export GST_PLUGIN_SCANNER=1 +export LD_LIBRARY_PATH=@QT_ROOT@/lib +export QT_DEBUG_PLUGINS=1 diff --git a/examples/qt-camera/qt.conf b/examples/qt-camera/qt.conf new file mode 100644 index 0000000000..eda41e5aea --- /dev/null +++ b/examples/qt-camera/qt.conf @@ -0,0 +1,3 @@ +[Paths] + +Plugins = "@QT_ROOT@/plugins" From c7a2b234620b0f57bdd2944077038db559a7b7a8 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 23 Sep 2017 22:13:00 +0300 Subject: [PATCH 0010/1014] Qt: ++PACKAGE_INTERNAL_DEPS_ID --- cmake/projects/Qt/hunter.cmake.in | 2 +- cmake/projects/Qt/qt3d/hunter.cmake | 2 +- cmake/projects/Qt/qtactiveqt/hunter.cmake | 2 +- cmake/projects/Qt/qtandroidextras/hunter.cmake | 2 +- cmake/projects/Qt/qtbase/hunter.cmake | 2 +- cmake/projects/Qt/qtcanvas3d/hunter.cmake | 2 +- cmake/projects/Qt/qtcharts/hunter.cmake | 2 +- cmake/projects/Qt/qtconnectivity/hunter.cmake | 2 +- cmake/projects/Qt/qtdatavis3d/hunter.cmake | 2 +- cmake/projects/Qt/qtdeclarative/hunter.cmake | 2 +- cmake/projects/Qt/qtdoc/hunter.cmake | 2 +- cmake/projects/Qt/qtdocgallery/hunter.cmake | 2 +- cmake/projects/Qt/qtenginio/hunter.cmake | 2 +- cmake/projects/Qt/qtfeedback/hunter.cmake | 2 +- cmake/projects/Qt/qtgamepad/hunter.cmake | 2 +- cmake/projects/Qt/qtgraphicaleffects/hunter.cmake | 2 +- cmake/projects/Qt/qtimageformats/hunter.cmake | 2 +- cmake/projects/Qt/qtlocation/hunter.cmake | 2 +- cmake/projects/Qt/qtmacextras/hunter.cmake | 2 +- cmake/projects/Qt/qtmultimedia/hunter.cmake | 2 +- cmake/projects/Qt/qtnetworkauth/hunter.cmake | 2 +- cmake/projects/Qt/qtpim/hunter.cmake | 2 +- cmake/projects/Qt/qtpurchasing/hunter.cmake | 2 +- cmake/projects/Qt/qtqa/hunter.cmake | 2 +- cmake/projects/Qt/qtquick1/hunter.cmake | 2 +- cmake/projects/Qt/qtquickcontrols/hunter.cmake | 2 +- cmake/projects/Qt/qtquickcontrols2/hunter.cmake | 2 +- cmake/projects/Qt/qtremoteobjects/hunter.cmake | 2 +- cmake/projects/Qt/qtrepotools/hunter.cmake | 2 +- cmake/projects/Qt/qtscript/hunter.cmake | 2 +- cmake/projects/Qt/qtscxml/hunter.cmake | 2 +- cmake/projects/Qt/qtsensors/hunter.cmake | 2 +- cmake/projects/Qt/qtserialbus/hunter.cmake | 2 +- cmake/projects/Qt/qtserialport/hunter.cmake | 2 +- cmake/projects/Qt/qtspeech/hunter.cmake | 2 +- cmake/projects/Qt/qtsvg/hunter.cmake | 2 +- cmake/projects/Qt/qtsystems/hunter.cmake | 2 +- cmake/projects/Qt/qttools/hunter.cmake | 2 +- cmake/projects/Qt/qttranslations/hunter.cmake | 2 +- cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake | 2 +- cmake/projects/Qt/qtwayland/hunter.cmake | 2 +- cmake/projects/Qt/qtwebchannel/hunter.cmake | 2 +- cmake/projects/Qt/qtwebengine/hunter.cmake | 2 +- cmake/projects/Qt/qtwebkit-examples/hunter.cmake | 2 +- cmake/projects/Qt/qtwebkit/hunter.cmake | 2 +- cmake/projects/Qt/qtwebsockets/hunter.cmake | 2 +- cmake/projects/Qt/qtwebview/hunter.cmake | 2 +- cmake/projects/Qt/qtwinextras/hunter.cmake | 2 +- cmake/projects/Qt/qtx11extras/hunter.cmake | 2 +- cmake/projects/Qt/qtxmlpatterns/hunter.cmake | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/cmake/projects/Qt/hunter.cmake.in b/cmake/projects/Qt/hunter.cmake.in index a70977740c..a2d9bd85a5 100644 --- a/cmake/projects/Qt/hunter.cmake.in +++ b/cmake/projects/Qt/hunter.cmake.in @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "@qt_component@" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qt3d/hunter.cmake b/cmake/projects/Qt/qt3d/hunter.cmake index 66d4a31119..e64618496f 100644 --- a/cmake/projects/Qt/qt3d/hunter.cmake +++ b/cmake/projects/Qt/qt3d/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qt3d" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtactiveqt/hunter.cmake b/cmake/projects/Qt/qtactiveqt/hunter.cmake index 6d6770bb8a..caba3c58a6 100644 --- a/cmake/projects/Qt/qtactiveqt/hunter.cmake +++ b/cmake/projects/Qt/qtactiveqt/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtactiveqt" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtandroidextras/hunter.cmake b/cmake/projects/Qt/qtandroidextras/hunter.cmake index f1c0e7a91c..4b8d35b0b5 100644 --- a/cmake/projects/Qt/qtandroidextras/hunter.cmake +++ b/cmake/projects/Qt/qtandroidextras/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtandroidextras" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtbase/hunter.cmake b/cmake/projects/Qt/qtbase/hunter.cmake index bb0d328cac..49817f11aa 100644 --- a/cmake/projects/Qt/qtbase/hunter.cmake +++ b/cmake/projects/Qt/qtbase/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtbase" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtcanvas3d/hunter.cmake b/cmake/projects/Qt/qtcanvas3d/hunter.cmake index 92644e7b38..9622d3f71e 100644 --- a/cmake/projects/Qt/qtcanvas3d/hunter.cmake +++ b/cmake/projects/Qt/qtcanvas3d/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtcanvas3d" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtcharts/hunter.cmake b/cmake/projects/Qt/qtcharts/hunter.cmake index 5f0bb0a8e0..0fb03bb13d 100644 --- a/cmake/projects/Qt/qtcharts/hunter.cmake +++ b/cmake/projects/Qt/qtcharts/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtcharts" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtconnectivity/hunter.cmake b/cmake/projects/Qt/qtconnectivity/hunter.cmake index a55ce1963d..c855a0c046 100644 --- a/cmake/projects/Qt/qtconnectivity/hunter.cmake +++ b/cmake/projects/Qt/qtconnectivity/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtconnectivity" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtdatavis3d/hunter.cmake b/cmake/projects/Qt/qtdatavis3d/hunter.cmake index 2fe8d601e4..9d46133413 100644 --- a/cmake/projects/Qt/qtdatavis3d/hunter.cmake +++ b/cmake/projects/Qt/qtdatavis3d/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtdatavis3d" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtdeclarative/hunter.cmake b/cmake/projects/Qt/qtdeclarative/hunter.cmake index 6a7b73fb14..43d8f0ec4f 100644 --- a/cmake/projects/Qt/qtdeclarative/hunter.cmake +++ b/cmake/projects/Qt/qtdeclarative/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtdeclarative" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtdoc/hunter.cmake b/cmake/projects/Qt/qtdoc/hunter.cmake index 38c3b2def7..5611199b4c 100644 --- a/cmake/projects/Qt/qtdoc/hunter.cmake +++ b/cmake/projects/Qt/qtdoc/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtdoc" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtdocgallery/hunter.cmake b/cmake/projects/Qt/qtdocgallery/hunter.cmake index 429eb755e2..fefef389a3 100644 --- a/cmake/projects/Qt/qtdocgallery/hunter.cmake +++ b/cmake/projects/Qt/qtdocgallery/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtdocgallery" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtenginio/hunter.cmake b/cmake/projects/Qt/qtenginio/hunter.cmake index b95dc91990..ac7c4b2446 100644 --- a/cmake/projects/Qt/qtenginio/hunter.cmake +++ b/cmake/projects/Qt/qtenginio/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtenginio" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtfeedback/hunter.cmake b/cmake/projects/Qt/qtfeedback/hunter.cmake index a3d845a1a2..5b8f8e657c 100644 --- a/cmake/projects/Qt/qtfeedback/hunter.cmake +++ b/cmake/projects/Qt/qtfeedback/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtfeedback" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtgamepad/hunter.cmake b/cmake/projects/Qt/qtgamepad/hunter.cmake index bdcc9784f5..92dec3b617 100644 --- a/cmake/projects/Qt/qtgamepad/hunter.cmake +++ b/cmake/projects/Qt/qtgamepad/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtgamepad" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtgraphicaleffects/hunter.cmake b/cmake/projects/Qt/qtgraphicaleffects/hunter.cmake index 2155ed6402..091d1dba40 100644 --- a/cmake/projects/Qt/qtgraphicaleffects/hunter.cmake +++ b/cmake/projects/Qt/qtgraphicaleffects/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtgraphicaleffects" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtimageformats/hunter.cmake b/cmake/projects/Qt/qtimageformats/hunter.cmake index dc6c84f4e0..949902ff54 100644 --- a/cmake/projects/Qt/qtimageformats/hunter.cmake +++ b/cmake/projects/Qt/qtimageformats/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtimageformats" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtlocation/hunter.cmake b/cmake/projects/Qt/qtlocation/hunter.cmake index 7d49d66e7a..70681ccdb7 100644 --- a/cmake/projects/Qt/qtlocation/hunter.cmake +++ b/cmake/projects/Qt/qtlocation/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtlocation" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtmacextras/hunter.cmake b/cmake/projects/Qt/qtmacextras/hunter.cmake index c388df61d7..640b207daa 100644 --- a/cmake/projects/Qt/qtmacextras/hunter.cmake +++ b/cmake/projects/Qt/qtmacextras/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtmacextras" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtmultimedia/hunter.cmake b/cmake/projects/Qt/qtmultimedia/hunter.cmake index 8eaccb2f7f..374c62105d 100644 --- a/cmake/projects/Qt/qtmultimedia/hunter.cmake +++ b/cmake/projects/Qt/qtmultimedia/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtmultimedia" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtnetworkauth/hunter.cmake b/cmake/projects/Qt/qtnetworkauth/hunter.cmake index c1da3e90a0..34f078091c 100644 --- a/cmake/projects/Qt/qtnetworkauth/hunter.cmake +++ b/cmake/projects/Qt/qtnetworkauth/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtnetworkauth" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtpim/hunter.cmake b/cmake/projects/Qt/qtpim/hunter.cmake index c2858397c8..6b0ee79498 100644 --- a/cmake/projects/Qt/qtpim/hunter.cmake +++ b/cmake/projects/Qt/qtpim/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtpim" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtpurchasing/hunter.cmake b/cmake/projects/Qt/qtpurchasing/hunter.cmake index e289d55370..1f2839efb8 100644 --- a/cmake/projects/Qt/qtpurchasing/hunter.cmake +++ b/cmake/projects/Qt/qtpurchasing/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtpurchasing" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtqa/hunter.cmake b/cmake/projects/Qt/qtqa/hunter.cmake index e40c07b118..a8d4137c9e 100644 --- a/cmake/projects/Qt/qtqa/hunter.cmake +++ b/cmake/projects/Qt/qtqa/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtqa" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtquick1/hunter.cmake b/cmake/projects/Qt/qtquick1/hunter.cmake index a0c2346edb..085ccc29d5 100644 --- a/cmake/projects/Qt/qtquick1/hunter.cmake +++ b/cmake/projects/Qt/qtquick1/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtquick1" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtquickcontrols/hunter.cmake b/cmake/projects/Qt/qtquickcontrols/hunter.cmake index 6446c25805..798c68740f 100644 --- a/cmake/projects/Qt/qtquickcontrols/hunter.cmake +++ b/cmake/projects/Qt/qtquickcontrols/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtquickcontrols" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtquickcontrols2/hunter.cmake b/cmake/projects/Qt/qtquickcontrols2/hunter.cmake index bbefe35dc5..a12ea70b9b 100644 --- a/cmake/projects/Qt/qtquickcontrols2/hunter.cmake +++ b/cmake/projects/Qt/qtquickcontrols2/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtquickcontrols2" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtremoteobjects/hunter.cmake b/cmake/projects/Qt/qtremoteobjects/hunter.cmake index f5fd98402b..210f9dab2a 100644 --- a/cmake/projects/Qt/qtremoteobjects/hunter.cmake +++ b/cmake/projects/Qt/qtremoteobjects/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtremoteobjects" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtrepotools/hunter.cmake b/cmake/projects/Qt/qtrepotools/hunter.cmake index 8ab1fc9bff..1c6857dbd7 100644 --- a/cmake/projects/Qt/qtrepotools/hunter.cmake +++ b/cmake/projects/Qt/qtrepotools/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtrepotools" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtscript/hunter.cmake b/cmake/projects/Qt/qtscript/hunter.cmake index 135d3eacdf..b161c834a6 100644 --- a/cmake/projects/Qt/qtscript/hunter.cmake +++ b/cmake/projects/Qt/qtscript/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtscript" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtscxml/hunter.cmake b/cmake/projects/Qt/qtscxml/hunter.cmake index 2554447d76..9821d2f08b 100644 --- a/cmake/projects/Qt/qtscxml/hunter.cmake +++ b/cmake/projects/Qt/qtscxml/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtscxml" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtsensors/hunter.cmake b/cmake/projects/Qt/qtsensors/hunter.cmake index 2cb2405de4..c782ac5fe2 100644 --- a/cmake/projects/Qt/qtsensors/hunter.cmake +++ b/cmake/projects/Qt/qtsensors/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtsensors" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtserialbus/hunter.cmake b/cmake/projects/Qt/qtserialbus/hunter.cmake index ddf26103eb..029b81d8a1 100644 --- a/cmake/projects/Qt/qtserialbus/hunter.cmake +++ b/cmake/projects/Qt/qtserialbus/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtserialbus" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtserialport/hunter.cmake b/cmake/projects/Qt/qtserialport/hunter.cmake index 6ee79d4f64..de8744e494 100644 --- a/cmake/projects/Qt/qtserialport/hunter.cmake +++ b/cmake/projects/Qt/qtserialport/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtserialport" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtspeech/hunter.cmake b/cmake/projects/Qt/qtspeech/hunter.cmake index 6cd623cc6a..f242ffa129 100644 --- a/cmake/projects/Qt/qtspeech/hunter.cmake +++ b/cmake/projects/Qt/qtspeech/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtspeech" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtsvg/hunter.cmake b/cmake/projects/Qt/qtsvg/hunter.cmake index a204d699db..d7126765bf 100644 --- a/cmake/projects/Qt/qtsvg/hunter.cmake +++ b/cmake/projects/Qt/qtsvg/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtsvg" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtsystems/hunter.cmake b/cmake/projects/Qt/qtsystems/hunter.cmake index 9e9a7fbfab..a553bde999 100644 --- a/cmake/projects/Qt/qtsystems/hunter.cmake +++ b/cmake/projects/Qt/qtsystems/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtsystems" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qttools/hunter.cmake b/cmake/projects/Qt/qttools/hunter.cmake index 54dd87e6c4..2b98f318cc 100644 --- a/cmake/projects/Qt/qttools/hunter.cmake +++ b/cmake/projects/Qt/qttools/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qttools" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qttranslations/hunter.cmake b/cmake/projects/Qt/qttranslations/hunter.cmake index c77bf83ab6..5cf423027b 100644 --- a/cmake/projects/Qt/qttranslations/hunter.cmake +++ b/cmake/projects/Qt/qttranslations/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qttranslations" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake b/cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake index 8048f8a572..032a3f6992 100644 --- a/cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake +++ b/cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtvirtualkeyboard" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtwayland/hunter.cmake b/cmake/projects/Qt/qtwayland/hunter.cmake index 48d1251c9f..584a16c133 100644 --- a/cmake/projects/Qt/qtwayland/hunter.cmake +++ b/cmake/projects/Qt/qtwayland/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwayland" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtwebchannel/hunter.cmake b/cmake/projects/Qt/qtwebchannel/hunter.cmake index dbb4861839..7748f0a807 100644 --- a/cmake/projects/Qt/qtwebchannel/hunter.cmake +++ b/cmake/projects/Qt/qtwebchannel/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebchannel" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtwebengine/hunter.cmake b/cmake/projects/Qt/qtwebengine/hunter.cmake index bcc02d895f..7aa7efc502 100644 --- a/cmake/projects/Qt/qtwebengine/hunter.cmake +++ b/cmake/projects/Qt/qtwebengine/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebengine" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtwebkit-examples/hunter.cmake b/cmake/projects/Qt/qtwebkit-examples/hunter.cmake index 6d225f0090..31bc7abb2f 100644 --- a/cmake/projects/Qt/qtwebkit-examples/hunter.cmake +++ b/cmake/projects/Qt/qtwebkit-examples/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebkit-examples" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtwebkit/hunter.cmake b/cmake/projects/Qt/qtwebkit/hunter.cmake index 383ca68e3d..724979a3da 100644 --- a/cmake/projects/Qt/qtwebkit/hunter.cmake +++ b/cmake/projects/Qt/qtwebkit/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebkit" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtwebsockets/hunter.cmake b/cmake/projects/Qt/qtwebsockets/hunter.cmake index a7f85f89f6..ee3b4869fe 100644 --- a/cmake/projects/Qt/qtwebsockets/hunter.cmake +++ b/cmake/projects/Qt/qtwebsockets/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebsockets" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtwebview/hunter.cmake b/cmake/projects/Qt/qtwebview/hunter.cmake index c0fda093ce..dc71e05a3c 100644 --- a/cmake/projects/Qt/qtwebview/hunter.cmake +++ b/cmake/projects/Qt/qtwebview/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebview" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtwinextras/hunter.cmake b/cmake/projects/Qt/qtwinextras/hunter.cmake index 79876bc91a..6179755c90 100644 --- a/cmake/projects/Qt/qtwinextras/hunter.cmake +++ b/cmake/projects/Qt/qtwinextras/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwinextras" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtx11extras/hunter.cmake b/cmake/projects/Qt/qtx11extras/hunter.cmake index 39effa55ba..973534525d 100644 --- a/cmake/projects/Qt/qtx11extras/hunter.cmake +++ b/cmake/projects/Qt/qtx11extras/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtx11extras" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) diff --git a/cmake/projects/Qt/qtxmlpatterns/hunter.cmake b/cmake/projects/Qt/qtxmlpatterns/hunter.cmake index 09e62f4b81..97534fff0a 100644 --- a/cmake/projects/Qt/qtxmlpatterns/hunter.cmake +++ b/cmake/projects/Qt/qtxmlpatterns/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtxmlpatterns" - PACKAGE_INTERNAL_DEPS_ID "10" + PACKAGE_INTERNAL_DEPS_ID "11" ) From 1f9b0915dceb018187d5cd821475f64d4782404c Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 23 Sep 2017 22:50:36 +0300 Subject: [PATCH 0011/1014] local-upload: Remove '--verbose' from scripts [skip ci] --- maintenance/local-upload/llvm/linux/gcc.sh | 2 +- .../local-upload/llvm/osx/run-osx-10-11-make.sh | 2 +- .../llvm/win/run-win-vs-14-2015-sdk-8-1.bat | 2 +- maintenance/local-upload/qt/linux/android.sh | 8 ++++---- maintenance/local-upload/qt/linux/clang-libstdcxx.sh | 8 ++++---- maintenance/local-upload/qt/linux/gcc.sh | 8 ++++---- maintenance/local-upload/qt/osx/run-osx-10-11-make.sh | 8 ++++---- maintenance/local-upload/qt/osx/run-osx-10-11.sh | 8 ++++---- ...run-osx-android-ndk-r10e-api-19-armeabi-v7a-neon.sh | 8 ++++---- .../qt/osx/run-osx-ios-nocodesign-9-3-wo-armv7s.sh | 8 ++++---- maintenance/local-upload/qt/win/run-win-mingw.bat | 10 +++++----- .../local-upload/qt/win/run-win-vs-12-2013-win64.bat | 10 +++++----- maintenance/local-upload/qt/win/run-win-vs-12-2013.bat | 10 +++++----- .../local-upload/qt/win/run-win-vs-14-2015-sdk-8-1.bat | 10 +++++----- 14 files changed, 51 insertions(+), 51 deletions(-) diff --git a/maintenance/local-upload/llvm/linux/gcc.sh b/maintenance/local-upload/llvm/linux/gcc.sh index e6b53caaf0..a0c3ccebe6 100755 --- a/maintenance/local-upload/llvm/linux/gcc.sh +++ b/maintenance/local-upload/llvm/linux/gcc.sh @@ -12,7 +12,7 @@ cd "${THIS_SCRIPT_DIR}/../../../.." # { export TOOLCHAIN=gcc -PROJECT_DIR=examples/LLVM ./jenkins.py --verbose --clear-except-download --upload +PROJECT_DIR=examples/LLVM ./jenkins.py --clear-except-download --upload # } echo "Done" diff --git a/maintenance/local-upload/llvm/osx/run-osx-10-11-make.sh b/maintenance/local-upload/llvm/osx/run-osx-10-11-make.sh index 419ed0ef5d..58e81a85bf 100755 --- a/maintenance/local-upload/llvm/osx/run-osx-10-11-make.sh +++ b/maintenance/local-upload/llvm/osx/run-osx-10-11-make.sh @@ -12,7 +12,7 @@ cd "${THIS_SCRIPT_DIR}/../../../.." # { export TOOLCHAIN=osx-10-11-make # same as 'libcxx' on Travis -PROJECT_DIR=examples/LLVM ./jenkins.py --verbose --clear-except-download --upload +PROJECT_DIR=examples/LLVM ./jenkins.py --clear-except-download --upload # } echo "Done" diff --git a/maintenance/local-upload/llvm/win/run-win-vs-14-2015-sdk-8-1.bat b/maintenance/local-upload/llvm/win/run-win-vs-14-2015-sdk-8-1.bat index 9e38d635bb..2668717241 100644 --- a/maintenance/local-upload/llvm/win/run-win-vs-14-2015-sdk-8-1.bat +++ b/maintenance/local-upload/llvm/win/run-win-vs-14-2015-sdk-8-1.bat @@ -1,5 +1,5 @@ REM { set TOOLCHAIN=vs-14-2015-sdk-8-1 set PROJECT_DIR=examples/LLVM -.\jenkins.py --verbose --upload --clear-except-download || exit /b 1 +.\jenkins.py --upload --clear-except-download || exit /b 1 REM } diff --git a/maintenance/local-upload/qt/linux/android.sh b/maintenance/local-upload/qt/linux/android.sh index ef100d53c2..f2e2e00361 100755 --- a/maintenance/local-upload/qt/linux/android.sh +++ b/maintenance/local-upload/qt/linux/android.sh @@ -13,10 +13,10 @@ cd "${THIS_SCRIPT_DIR}/../../../.." # { export TOOLCHAIN=android-ndk-r10e-api-19-armeabi-v7a-neon -PROJECT_DIR=examples/qt-widgets ./jenkins.py --verbose --clear-except-download -PROJECT_DIR=examples/qt-camera ./jenkins.py --verbose --nocreate -PROJECT_DIR=examples/qt-location ./jenkins.py --verbose --nocreate -PROJECT_DIR=examples/qt-qml ./jenkins.py --verbose --upload --nocreate +PROJECT_DIR=examples/qt-widgets ./jenkins.py --clear-except-download +PROJECT_DIR=examples/qt-camera ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-location ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-qml ./jenkins.py --upload --nocreate # } echo "Done" diff --git a/maintenance/local-upload/qt/linux/clang-libstdcxx.sh b/maintenance/local-upload/qt/linux/clang-libstdcxx.sh index 08bbfd1bf1..67791f6b54 100755 --- a/maintenance/local-upload/qt/linux/clang-libstdcxx.sh +++ b/maintenance/local-upload/qt/linux/clang-libstdcxx.sh @@ -13,10 +13,10 @@ cd "${THIS_SCRIPT_DIR}/../../../.." # { export TOOLCHAIN=clang-libstdcxx -PROJECT_DIR=examples/qt-widgets ./jenkins.py --verbose --clear-except-download -PROJECT_DIR=examples/qt-camera ./jenkins.py --verbose --nocreate -# PROJECT_DIR=examples/qt-location ./jenkins.py --verbose --nocreate # Broken (see .travis.yml) -PROJECT_DIR=examples/qt-qml ./jenkins.py --verbose --upload --nocreate +PROJECT_DIR=examples/qt-widgets ./jenkins.py --clear-except-download +PROJECT_DIR=examples/qt-camera ./jenkins.py --nocreate +# PROJECT_DIR=examples/qt-location ./jenkins.py --nocreate # Broken (see .travis.yml) +PROJECT_DIR=examples/qt-qml ./jenkins.py --upload --nocreate # } echo "Done" diff --git a/maintenance/local-upload/qt/linux/gcc.sh b/maintenance/local-upload/qt/linux/gcc.sh index f32030b263..fa424d56c3 100755 --- a/maintenance/local-upload/qt/linux/gcc.sh +++ b/maintenance/local-upload/qt/linux/gcc.sh @@ -13,10 +13,10 @@ cd "${THIS_SCRIPT_DIR}/../../../.." # { export TOOLCHAIN=gcc -PROJECT_DIR=examples/qt-widgets ./jenkins.py --verbose --clear-except-download -PROJECT_DIR=examples/qt-camera ./jenkins.py --verbose --nocreate -PROJECT_DIR=examples/qt-location ./jenkins.py --verbose --nocreate -PROJECT_DIR=examples/qt-qml ./jenkins.py --verbose --upload --nocreate +PROJECT_DIR=examples/qt-widgets ./jenkins.py --clear-except-download +PROJECT_DIR=examples/qt-camera ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-location ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-qml ./jenkins.py --upload --nocreate # } echo "Done" diff --git a/maintenance/local-upload/qt/osx/run-osx-10-11-make.sh b/maintenance/local-upload/qt/osx/run-osx-10-11-make.sh index 74dc98a321..25d4e39cdb 100755 --- a/maintenance/local-upload/qt/osx/run-osx-10-11-make.sh +++ b/maintenance/local-upload/qt/osx/run-osx-10-11-make.sh @@ -12,10 +12,10 @@ cd "${THIS_SCRIPT_DIR}/../../../.." # { export TOOLCHAIN=osx-10-11-make # same as 'libcxx' on Travis -PROJECT_DIR=examples/qt-widgets ./jenkins.py --verbose --clear-except-download -PROJECT_DIR=examples/qt-camera ./jenkins.py --verbose --nocreate -PROJECT_DIR=examples/qt-location ./jenkins.py --verbose --nocreate -PROJECT_DIR=examples/qt-qml ./jenkins.py --verbose --upload --nocreate +PROJECT_DIR=examples/qt-widgets ./jenkins.py --clear-except-download +PROJECT_DIR=examples/qt-camera ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-location ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-qml ./jenkins.py --upload --nocreate # } echo "Done" diff --git a/maintenance/local-upload/qt/osx/run-osx-10-11.sh b/maintenance/local-upload/qt/osx/run-osx-10-11.sh index 615cd1cf6f..854c0547d5 100755 --- a/maintenance/local-upload/qt/osx/run-osx-10-11.sh +++ b/maintenance/local-upload/qt/osx/run-osx-10-11.sh @@ -12,10 +12,10 @@ cd "${THIS_SCRIPT_DIR}/../../../.." # { export TOOLCHAIN=osx-10-11 -PROJECT_DIR=examples/qt-widgets ./jenkins.py --verbose --clear-except-download -PROJECT_DIR=examples/qt-camera ./jenkins.py --verbose --nocreate -PROJECT_DIR=examples/qt-location ./jenkins.py --verbose --nocreate -PROJECT_DIR=examples/qt-qml ./jenkins.py --verbose --upload --nocreate +PROJECT_DIR=examples/qt-widgets ./jenkins.py --clear-except-download +PROJECT_DIR=examples/qt-camera ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-location ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-qml ./jenkins.py --upload --nocreate # } echo "Done" diff --git a/maintenance/local-upload/qt/osx/run-osx-android-ndk-r10e-api-19-armeabi-v7a-neon.sh b/maintenance/local-upload/qt/osx/run-osx-android-ndk-r10e-api-19-armeabi-v7a-neon.sh index ef100d53c2..f2e2e00361 100755 --- a/maintenance/local-upload/qt/osx/run-osx-android-ndk-r10e-api-19-armeabi-v7a-neon.sh +++ b/maintenance/local-upload/qt/osx/run-osx-android-ndk-r10e-api-19-armeabi-v7a-neon.sh @@ -13,10 +13,10 @@ cd "${THIS_SCRIPT_DIR}/../../../.." # { export TOOLCHAIN=android-ndk-r10e-api-19-armeabi-v7a-neon -PROJECT_DIR=examples/qt-widgets ./jenkins.py --verbose --clear-except-download -PROJECT_DIR=examples/qt-camera ./jenkins.py --verbose --nocreate -PROJECT_DIR=examples/qt-location ./jenkins.py --verbose --nocreate -PROJECT_DIR=examples/qt-qml ./jenkins.py --verbose --upload --nocreate +PROJECT_DIR=examples/qt-widgets ./jenkins.py --clear-except-download +PROJECT_DIR=examples/qt-camera ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-location ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-qml ./jenkins.py --upload --nocreate # } echo "Done" diff --git a/maintenance/local-upload/qt/osx/run-osx-ios-nocodesign-9-3-wo-armv7s.sh b/maintenance/local-upload/qt/osx/run-osx-ios-nocodesign-9-3-wo-armv7s.sh index f0c5b51f8b..41e96fde9c 100755 --- a/maintenance/local-upload/qt/osx/run-osx-ios-nocodesign-9-3-wo-armv7s.sh +++ b/maintenance/local-upload/qt/osx/run-osx-ios-nocodesign-9-3-wo-armv7s.sh @@ -12,8 +12,8 @@ cd "${THIS_SCRIPT_DIR}/../../../.." # { export TOOLCHAIN=ios-nocodesign-9-3-wo-armv7s -PROJECT_DIR=examples/qt-widgets ./jenkins.py --verbose --clear-except-download -PROJECT_DIR=examples/qt-camera ./jenkins.py --verbose --nocreate -PROJECT_DIR=examples/qt-location ./jenkins.py --verbose --nocreate -PROJECT_DIR=examples/qt-qml ./jenkins.py --verbose --upload --nocreate +PROJECT_DIR=examples/qt-widgets ./jenkins.py --clear-except-download +PROJECT_DIR=examples/qt-camera ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-location ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-qml ./jenkins.py --upload --nocreate # } diff --git a/maintenance/local-upload/qt/win/run-win-mingw.bat b/maintenance/local-upload/qt/win/run-win-mingw.bat index e616cab7ba..2967832814 100644 --- a/maintenance/local-upload/qt/win/run-win-mingw.bat +++ b/maintenance/local-upload/qt/win/run-win-mingw.bat @@ -1,13 +1,13 @@ REM { set TOOLCHAIN=mingw set PROJECT_DIR=examples/qt-widgets -.\jenkins.py --verbose --clear-except-download || exit /b 1 +.\jenkins.py --clear-except-download || exit /b 1 set PROJECT_DIR=examples/qt-core -.\jenkins.py --verbose --nocreate || exit /b 1 +.\jenkins.py --nocreate || exit /b 1 set PROJECT_DIR=examples/qt-qml -.\jenkins.py --verbose --nocreate || exit /b 1 +.\jenkins.py --nocreate || exit /b 1 set PROJECT_DIR=examples/qt-location -.\jenkins.py --verbose --nocreate || exit /b 1 +.\jenkins.py --nocreate || exit /b 1 set PROJECT_DIR=examples/qt-camera -.\jenkins.py --verbose --upload --nocreate || exit /b 1 +.\jenkins.py --upload --nocreate || exit /b 1 REM } diff --git a/maintenance/local-upload/qt/win/run-win-vs-12-2013-win64.bat b/maintenance/local-upload/qt/win/run-win-vs-12-2013-win64.bat index dd9c20bf85..1f38b51d27 100644 --- a/maintenance/local-upload/qt/win/run-win-vs-12-2013-win64.bat +++ b/maintenance/local-upload/qt/win/run-win-vs-12-2013-win64.bat @@ -1,13 +1,13 @@ REM { set TOOLCHAIN=vs-12-2013-win64 set PROJECT_DIR=examples/qt-widgets -.\jenkins.py --verbose --clear-except-download || exit /b 1 +.\jenkins.py --clear-except-download || exit /b 1 set PROJECT_DIR=examples/qt-core -.\jenkins.py --verbose --nocreate || exit /b 1 +.\jenkins.py --nocreate || exit /b 1 set PROJECT_DIR=examples/qt-qml -.\jenkins.py --verbose --nocreate || exit /b 1 +.\jenkins.py --nocreate || exit /b 1 set PROJECT_DIR=examples/qt-location -.\jenkins.py --verbose --nocreate || exit /b 1 +.\jenkins.py --nocreate || exit /b 1 set PROJECT_DIR=examples/qt-camera -.\jenkins.py --verbose --upload --nocreate || exit /b 1 +.\jenkins.py --upload --nocreate || exit /b 1 REM } diff --git a/maintenance/local-upload/qt/win/run-win-vs-12-2013.bat b/maintenance/local-upload/qt/win/run-win-vs-12-2013.bat index 4718bf67bc..166e972728 100644 --- a/maintenance/local-upload/qt/win/run-win-vs-12-2013.bat +++ b/maintenance/local-upload/qt/win/run-win-vs-12-2013.bat @@ -1,13 +1,13 @@ REM { set TOOLCHAIN=vs-12-2013 set PROJECT_DIR=examples/qt-widgets -.\jenkins.py --verbose --clear-except-download || exit /b 1 +.\jenkins.py --clear-except-download || exit /b 1 set PROJECT_DIR=examples/qt-core -.\jenkins.py --verbose --nocreate || exit /b 1 +.\jenkins.py --nocreate || exit /b 1 set PROJECT_DIR=examples/qt-qml -.\jenkins.py --verbose --nocreate || exit /b 1 +.\jenkins.py --nocreate || exit /b 1 set PROJECT_DIR=examples/qt-location -.\jenkins.py --verbose --nocreate || exit /b 1 +.\jenkins.py --nocreate || exit /b 1 set PROJECT_DIR=examples/qt-camera -.\jenkins.py --verbose --upload --nocreate || exit /b 1 +.\jenkins.py --upload --nocreate || exit /b 1 REM } diff --git a/maintenance/local-upload/qt/win/run-win-vs-14-2015-sdk-8-1.bat b/maintenance/local-upload/qt/win/run-win-vs-14-2015-sdk-8-1.bat index c4add96fe1..77be08fc7a 100644 --- a/maintenance/local-upload/qt/win/run-win-vs-14-2015-sdk-8-1.bat +++ b/maintenance/local-upload/qt/win/run-win-vs-14-2015-sdk-8-1.bat @@ -1,13 +1,13 @@ REM { set TOOLCHAIN=vs-14-2015-sdk-8-1 set PROJECT_DIR=examples/qt-widgets -.\jenkins.py --verbose --clear-except-download || exit /b 1 +.\jenkins.py --clear-except-download || exit /b 1 set PROJECT_DIR=examples/qt-core -.\jenkins.py --verbose --nocreate || exit /b 1 +.\jenkins.py --nocreate || exit /b 1 set PROJECT_DIR=examples/qt-qml -.\jenkins.py --verbose --nocreate || exit /b 1 +.\jenkins.py --nocreate || exit /b 1 set PROJECT_DIR=examples/qt-location -.\jenkins.py --verbose --nocreate || exit /b 1 +.\jenkins.py --nocreate || exit /b 1 set PROJECT_DIR=examples/qt-camera -.\jenkins.py --verbose --upload --nocreate || exit /b 1 +.\jenkins.py --upload --nocreate || exit /b 1 REM } From 4cda2351b19fcfddfb34014d496882e969f27aac Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Mon, 25 Sep 2017 15:08:53 +0300 Subject: [PATCH 0012/1014] qt-camera: More dependencies --- examples/qt-camera/config.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/qt-camera/config.cmake b/examples/qt-camera/config.cmake index 9777553535..ae13c5de55 100644 --- a/examples/qt-camera/config.cmake +++ b/examples/qt-camera/config.cmake @@ -24,6 +24,9 @@ if(is_linux) xdamage xext xfixes + xi + xinerama + xrandr xrender xshmfence xxf86vm From 433f48b30e055d944de7c4a6584259d6a7e8ce47 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Mon, 25 Sep 2017 15:09:50 +0300 Subject: [PATCH 0013/1014] Qt Linux: Fix RPATH for tools --- .../projects/Qt/ep-stages/qt-install.cmake.in | 23 +++++++++++++++++++ .../projects/Qt/schemes/url_sha1_qt.cmake.in | 2 ++ 2 files changed, 25 insertions(+) diff --git a/cmake/projects/Qt/ep-stages/qt-install.cmake.in b/cmake/projects/Qt/ep-stages/qt-install.cmake.in index 290466c10a..83688d2eb5 100644 --- a/cmake/projects/Qt/ep-stages/qt-install.cmake.in +++ b/cmake/projects/Qt/ep-stages/qt-install.cmake.in @@ -64,6 +64,7 @@ foreach(deps ${depends_on}) endforeach() string(COMPARE EQUAL "@qt_component@" "qttools" is_qttools) +string(COMPARE EQUAL "@qt_component@" "qtbase" is_qtbase) list(FIND depends_on "qttools" depends_on_qttools_index) include("@hunter_self@/scripts/clear-all.cmake") @@ -181,6 +182,28 @@ if("@IOS@") endforeach() endif() +# Fix RPATH issue: +# * https://github.com/hunter-packages/Qt/issues/3 +if("@HUNTER_QT_OS_IS_LINUX@" AND "@BUILD_SHARED_LIBS@" AND is_qtbase) + set( + rpath_fix_list + qdbuscpp2xml + qdbusxml2cpp + qdoc + qlalr + uic + ) + + foreach(x ${rpath_fix_list}) + file( + RPATH_CHANGE + FILE "@local_install_dir@/bin/${x}" + OLD_RPATH "@local_install_dir@/lib" + NEW_RPATH "$ORIGIN/../lib" + ) + endforeach() +endif() + set( qml_plugin_from "@local_install_dir@/lib/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake" diff --git a/cmake/projects/Qt/schemes/url_sha1_qt.cmake.in b/cmake/projects/Qt/schemes/url_sha1_qt.cmake.in index 115cd0ebef..dc2e46cee4 100644 --- a/cmake/projects/Qt/schemes/url_sha1_qt.cmake.in +++ b/cmake/projects/Qt/schemes/url_sha1_qt.cmake.in @@ -381,6 +381,8 @@ configure_file( # * ANDROID # * IOS # * HUNTER_Qt_VERSION +# * HUNTER_QT_OS_IS_LINUX +# * BUILD_SHARED_LIBS configure_file( "@HUNTER_PACKAGE_SETUP_DIR@/ep-stages/qt-install.cmake.in" "@HUNTER_PACKAGE_BUILD_DIR@/qt-install.cmake" From 3366180ec125a630a780296b55b1fad6cd8fdd67 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Mon, 25 Sep 2017 15:11:02 +0300 Subject: [PATCH 0014/1014] Qt: ++PACKAGE_INTERNAL_DEPS_ID --- cmake/projects/Qt/hunter.cmake.in | 2 +- cmake/projects/Qt/qt3d/hunter.cmake | 2 +- cmake/projects/Qt/qtactiveqt/hunter.cmake | 2 +- cmake/projects/Qt/qtandroidextras/hunter.cmake | 2 +- cmake/projects/Qt/qtbase/hunter.cmake | 2 +- cmake/projects/Qt/qtcanvas3d/hunter.cmake | 2 +- cmake/projects/Qt/qtcharts/hunter.cmake | 2 +- cmake/projects/Qt/qtconnectivity/hunter.cmake | 2 +- cmake/projects/Qt/qtdatavis3d/hunter.cmake | 2 +- cmake/projects/Qt/qtdeclarative/hunter.cmake | 2 +- cmake/projects/Qt/qtdoc/hunter.cmake | 2 +- cmake/projects/Qt/qtdocgallery/hunter.cmake | 2 +- cmake/projects/Qt/qtenginio/hunter.cmake | 2 +- cmake/projects/Qt/qtfeedback/hunter.cmake | 2 +- cmake/projects/Qt/qtgamepad/hunter.cmake | 2 +- cmake/projects/Qt/qtgraphicaleffects/hunter.cmake | 2 +- cmake/projects/Qt/qtimageformats/hunter.cmake | 2 +- cmake/projects/Qt/qtlocation/hunter.cmake | 2 +- cmake/projects/Qt/qtmacextras/hunter.cmake | 2 +- cmake/projects/Qt/qtmultimedia/hunter.cmake | 2 +- cmake/projects/Qt/qtnetworkauth/hunter.cmake | 2 +- cmake/projects/Qt/qtpim/hunter.cmake | 2 +- cmake/projects/Qt/qtpurchasing/hunter.cmake | 2 +- cmake/projects/Qt/qtqa/hunter.cmake | 2 +- cmake/projects/Qt/qtquick1/hunter.cmake | 2 +- cmake/projects/Qt/qtquickcontrols/hunter.cmake | 2 +- cmake/projects/Qt/qtquickcontrols2/hunter.cmake | 2 +- cmake/projects/Qt/qtremoteobjects/hunter.cmake | 2 +- cmake/projects/Qt/qtrepotools/hunter.cmake | 2 +- cmake/projects/Qt/qtscript/hunter.cmake | 2 +- cmake/projects/Qt/qtscxml/hunter.cmake | 2 +- cmake/projects/Qt/qtsensors/hunter.cmake | 2 +- cmake/projects/Qt/qtserialbus/hunter.cmake | 2 +- cmake/projects/Qt/qtserialport/hunter.cmake | 2 +- cmake/projects/Qt/qtspeech/hunter.cmake | 2 +- cmake/projects/Qt/qtsvg/hunter.cmake | 2 +- cmake/projects/Qt/qtsystems/hunter.cmake | 2 +- cmake/projects/Qt/qttools/hunter.cmake | 2 +- cmake/projects/Qt/qttranslations/hunter.cmake | 2 +- cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake | 2 +- cmake/projects/Qt/qtwayland/hunter.cmake | 2 +- cmake/projects/Qt/qtwebchannel/hunter.cmake | 2 +- cmake/projects/Qt/qtwebengine/hunter.cmake | 2 +- cmake/projects/Qt/qtwebkit-examples/hunter.cmake | 2 +- cmake/projects/Qt/qtwebkit/hunter.cmake | 2 +- cmake/projects/Qt/qtwebsockets/hunter.cmake | 2 +- cmake/projects/Qt/qtwebview/hunter.cmake | 2 +- cmake/projects/Qt/qtwinextras/hunter.cmake | 2 +- cmake/projects/Qt/qtx11extras/hunter.cmake | 2 +- cmake/projects/Qt/qtxmlpatterns/hunter.cmake | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/cmake/projects/Qt/hunter.cmake.in b/cmake/projects/Qt/hunter.cmake.in index a2d9bd85a5..7176165782 100644 --- a/cmake/projects/Qt/hunter.cmake.in +++ b/cmake/projects/Qt/hunter.cmake.in @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "@qt_component@" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qt3d/hunter.cmake b/cmake/projects/Qt/qt3d/hunter.cmake index e64618496f..4841bb39d2 100644 --- a/cmake/projects/Qt/qt3d/hunter.cmake +++ b/cmake/projects/Qt/qt3d/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qt3d" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtactiveqt/hunter.cmake b/cmake/projects/Qt/qtactiveqt/hunter.cmake index caba3c58a6..d82dbf6e19 100644 --- a/cmake/projects/Qt/qtactiveqt/hunter.cmake +++ b/cmake/projects/Qt/qtactiveqt/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtactiveqt" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtandroidextras/hunter.cmake b/cmake/projects/Qt/qtandroidextras/hunter.cmake index 4b8d35b0b5..b238489a0f 100644 --- a/cmake/projects/Qt/qtandroidextras/hunter.cmake +++ b/cmake/projects/Qt/qtandroidextras/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtandroidextras" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtbase/hunter.cmake b/cmake/projects/Qt/qtbase/hunter.cmake index 49817f11aa..a7cb0df1e1 100644 --- a/cmake/projects/Qt/qtbase/hunter.cmake +++ b/cmake/projects/Qt/qtbase/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtbase" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtcanvas3d/hunter.cmake b/cmake/projects/Qt/qtcanvas3d/hunter.cmake index 9622d3f71e..541645f505 100644 --- a/cmake/projects/Qt/qtcanvas3d/hunter.cmake +++ b/cmake/projects/Qt/qtcanvas3d/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtcanvas3d" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtcharts/hunter.cmake b/cmake/projects/Qt/qtcharts/hunter.cmake index 0fb03bb13d..aacb637767 100644 --- a/cmake/projects/Qt/qtcharts/hunter.cmake +++ b/cmake/projects/Qt/qtcharts/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtcharts" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtconnectivity/hunter.cmake b/cmake/projects/Qt/qtconnectivity/hunter.cmake index c855a0c046..7e3ef1a7a1 100644 --- a/cmake/projects/Qt/qtconnectivity/hunter.cmake +++ b/cmake/projects/Qt/qtconnectivity/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtconnectivity" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtdatavis3d/hunter.cmake b/cmake/projects/Qt/qtdatavis3d/hunter.cmake index 9d46133413..9834bf791c 100644 --- a/cmake/projects/Qt/qtdatavis3d/hunter.cmake +++ b/cmake/projects/Qt/qtdatavis3d/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtdatavis3d" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtdeclarative/hunter.cmake b/cmake/projects/Qt/qtdeclarative/hunter.cmake index 43d8f0ec4f..baea9ea4d2 100644 --- a/cmake/projects/Qt/qtdeclarative/hunter.cmake +++ b/cmake/projects/Qt/qtdeclarative/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtdeclarative" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtdoc/hunter.cmake b/cmake/projects/Qt/qtdoc/hunter.cmake index 5611199b4c..eee37bf930 100644 --- a/cmake/projects/Qt/qtdoc/hunter.cmake +++ b/cmake/projects/Qt/qtdoc/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtdoc" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtdocgallery/hunter.cmake b/cmake/projects/Qt/qtdocgallery/hunter.cmake index fefef389a3..6129489d3e 100644 --- a/cmake/projects/Qt/qtdocgallery/hunter.cmake +++ b/cmake/projects/Qt/qtdocgallery/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtdocgallery" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtenginio/hunter.cmake b/cmake/projects/Qt/qtenginio/hunter.cmake index ac7c4b2446..48a866488c 100644 --- a/cmake/projects/Qt/qtenginio/hunter.cmake +++ b/cmake/projects/Qt/qtenginio/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtenginio" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtfeedback/hunter.cmake b/cmake/projects/Qt/qtfeedback/hunter.cmake index 5b8f8e657c..5ad2575843 100644 --- a/cmake/projects/Qt/qtfeedback/hunter.cmake +++ b/cmake/projects/Qt/qtfeedback/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtfeedback" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtgamepad/hunter.cmake b/cmake/projects/Qt/qtgamepad/hunter.cmake index 92dec3b617..ea1416f04e 100644 --- a/cmake/projects/Qt/qtgamepad/hunter.cmake +++ b/cmake/projects/Qt/qtgamepad/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtgamepad" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtgraphicaleffects/hunter.cmake b/cmake/projects/Qt/qtgraphicaleffects/hunter.cmake index 091d1dba40..47fa83f0b3 100644 --- a/cmake/projects/Qt/qtgraphicaleffects/hunter.cmake +++ b/cmake/projects/Qt/qtgraphicaleffects/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtgraphicaleffects" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtimageformats/hunter.cmake b/cmake/projects/Qt/qtimageformats/hunter.cmake index 949902ff54..4777fa0308 100644 --- a/cmake/projects/Qt/qtimageformats/hunter.cmake +++ b/cmake/projects/Qt/qtimageformats/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtimageformats" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtlocation/hunter.cmake b/cmake/projects/Qt/qtlocation/hunter.cmake index 70681ccdb7..0c7ba8b388 100644 --- a/cmake/projects/Qt/qtlocation/hunter.cmake +++ b/cmake/projects/Qt/qtlocation/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtlocation" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtmacextras/hunter.cmake b/cmake/projects/Qt/qtmacextras/hunter.cmake index 640b207daa..2825f33d82 100644 --- a/cmake/projects/Qt/qtmacextras/hunter.cmake +++ b/cmake/projects/Qt/qtmacextras/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtmacextras" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtmultimedia/hunter.cmake b/cmake/projects/Qt/qtmultimedia/hunter.cmake index 374c62105d..2f76626407 100644 --- a/cmake/projects/Qt/qtmultimedia/hunter.cmake +++ b/cmake/projects/Qt/qtmultimedia/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtmultimedia" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtnetworkauth/hunter.cmake b/cmake/projects/Qt/qtnetworkauth/hunter.cmake index 34f078091c..6ead10e813 100644 --- a/cmake/projects/Qt/qtnetworkauth/hunter.cmake +++ b/cmake/projects/Qt/qtnetworkauth/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtnetworkauth" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtpim/hunter.cmake b/cmake/projects/Qt/qtpim/hunter.cmake index 6b0ee79498..cb9f87309f 100644 --- a/cmake/projects/Qt/qtpim/hunter.cmake +++ b/cmake/projects/Qt/qtpim/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtpim" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtpurchasing/hunter.cmake b/cmake/projects/Qt/qtpurchasing/hunter.cmake index 1f2839efb8..0f8095863a 100644 --- a/cmake/projects/Qt/qtpurchasing/hunter.cmake +++ b/cmake/projects/Qt/qtpurchasing/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtpurchasing" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtqa/hunter.cmake b/cmake/projects/Qt/qtqa/hunter.cmake index a8d4137c9e..07f0fd82da 100644 --- a/cmake/projects/Qt/qtqa/hunter.cmake +++ b/cmake/projects/Qt/qtqa/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtqa" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtquick1/hunter.cmake b/cmake/projects/Qt/qtquick1/hunter.cmake index 085ccc29d5..adc11c0285 100644 --- a/cmake/projects/Qt/qtquick1/hunter.cmake +++ b/cmake/projects/Qt/qtquick1/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtquick1" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtquickcontrols/hunter.cmake b/cmake/projects/Qt/qtquickcontrols/hunter.cmake index 798c68740f..2aaf139087 100644 --- a/cmake/projects/Qt/qtquickcontrols/hunter.cmake +++ b/cmake/projects/Qt/qtquickcontrols/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtquickcontrols" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtquickcontrols2/hunter.cmake b/cmake/projects/Qt/qtquickcontrols2/hunter.cmake index a12ea70b9b..9d784f3fba 100644 --- a/cmake/projects/Qt/qtquickcontrols2/hunter.cmake +++ b/cmake/projects/Qt/qtquickcontrols2/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtquickcontrols2" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtremoteobjects/hunter.cmake b/cmake/projects/Qt/qtremoteobjects/hunter.cmake index 210f9dab2a..44bee6d89f 100644 --- a/cmake/projects/Qt/qtremoteobjects/hunter.cmake +++ b/cmake/projects/Qt/qtremoteobjects/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtremoteobjects" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtrepotools/hunter.cmake b/cmake/projects/Qt/qtrepotools/hunter.cmake index 1c6857dbd7..a37d94823f 100644 --- a/cmake/projects/Qt/qtrepotools/hunter.cmake +++ b/cmake/projects/Qt/qtrepotools/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtrepotools" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtscript/hunter.cmake b/cmake/projects/Qt/qtscript/hunter.cmake index b161c834a6..6a515a0ca7 100644 --- a/cmake/projects/Qt/qtscript/hunter.cmake +++ b/cmake/projects/Qt/qtscript/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtscript" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtscxml/hunter.cmake b/cmake/projects/Qt/qtscxml/hunter.cmake index 9821d2f08b..d17be66551 100644 --- a/cmake/projects/Qt/qtscxml/hunter.cmake +++ b/cmake/projects/Qt/qtscxml/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtscxml" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtsensors/hunter.cmake b/cmake/projects/Qt/qtsensors/hunter.cmake index c782ac5fe2..cf2acf16b9 100644 --- a/cmake/projects/Qt/qtsensors/hunter.cmake +++ b/cmake/projects/Qt/qtsensors/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtsensors" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtserialbus/hunter.cmake b/cmake/projects/Qt/qtserialbus/hunter.cmake index 029b81d8a1..979b4bf54c 100644 --- a/cmake/projects/Qt/qtserialbus/hunter.cmake +++ b/cmake/projects/Qt/qtserialbus/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtserialbus" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtserialport/hunter.cmake b/cmake/projects/Qt/qtserialport/hunter.cmake index de8744e494..fec003e9e6 100644 --- a/cmake/projects/Qt/qtserialport/hunter.cmake +++ b/cmake/projects/Qt/qtserialport/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtserialport" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtspeech/hunter.cmake b/cmake/projects/Qt/qtspeech/hunter.cmake index f242ffa129..332f32e542 100644 --- a/cmake/projects/Qt/qtspeech/hunter.cmake +++ b/cmake/projects/Qt/qtspeech/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtspeech" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtsvg/hunter.cmake b/cmake/projects/Qt/qtsvg/hunter.cmake index d7126765bf..dc1586a430 100644 --- a/cmake/projects/Qt/qtsvg/hunter.cmake +++ b/cmake/projects/Qt/qtsvg/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtsvg" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtsystems/hunter.cmake b/cmake/projects/Qt/qtsystems/hunter.cmake index a553bde999..e16175cfb3 100644 --- a/cmake/projects/Qt/qtsystems/hunter.cmake +++ b/cmake/projects/Qt/qtsystems/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtsystems" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qttools/hunter.cmake b/cmake/projects/Qt/qttools/hunter.cmake index 2b98f318cc..c8f88293cc 100644 --- a/cmake/projects/Qt/qttools/hunter.cmake +++ b/cmake/projects/Qt/qttools/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qttools" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qttranslations/hunter.cmake b/cmake/projects/Qt/qttranslations/hunter.cmake index 5cf423027b..e21a4dab4a 100644 --- a/cmake/projects/Qt/qttranslations/hunter.cmake +++ b/cmake/projects/Qt/qttranslations/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qttranslations" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake b/cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake index 032a3f6992..833d88b0b0 100644 --- a/cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake +++ b/cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtvirtualkeyboard" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtwayland/hunter.cmake b/cmake/projects/Qt/qtwayland/hunter.cmake index 584a16c133..337e721fc7 100644 --- a/cmake/projects/Qt/qtwayland/hunter.cmake +++ b/cmake/projects/Qt/qtwayland/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwayland" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtwebchannel/hunter.cmake b/cmake/projects/Qt/qtwebchannel/hunter.cmake index 7748f0a807..0c4621ab47 100644 --- a/cmake/projects/Qt/qtwebchannel/hunter.cmake +++ b/cmake/projects/Qt/qtwebchannel/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebchannel" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtwebengine/hunter.cmake b/cmake/projects/Qt/qtwebengine/hunter.cmake index 7aa7efc502..958c3de6c6 100644 --- a/cmake/projects/Qt/qtwebengine/hunter.cmake +++ b/cmake/projects/Qt/qtwebengine/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebengine" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtwebkit-examples/hunter.cmake b/cmake/projects/Qt/qtwebkit-examples/hunter.cmake index 31bc7abb2f..8b5cbb3c99 100644 --- a/cmake/projects/Qt/qtwebkit-examples/hunter.cmake +++ b/cmake/projects/Qt/qtwebkit-examples/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebkit-examples" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtwebkit/hunter.cmake b/cmake/projects/Qt/qtwebkit/hunter.cmake index 724979a3da..1c1ed840fa 100644 --- a/cmake/projects/Qt/qtwebkit/hunter.cmake +++ b/cmake/projects/Qt/qtwebkit/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebkit" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtwebsockets/hunter.cmake b/cmake/projects/Qt/qtwebsockets/hunter.cmake index ee3b4869fe..4871105e74 100644 --- a/cmake/projects/Qt/qtwebsockets/hunter.cmake +++ b/cmake/projects/Qt/qtwebsockets/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebsockets" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtwebview/hunter.cmake b/cmake/projects/Qt/qtwebview/hunter.cmake index dc71e05a3c..13f2e7e96a 100644 --- a/cmake/projects/Qt/qtwebview/hunter.cmake +++ b/cmake/projects/Qt/qtwebview/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebview" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtwinextras/hunter.cmake b/cmake/projects/Qt/qtwinextras/hunter.cmake index 6179755c90..9d87090f9b 100644 --- a/cmake/projects/Qt/qtwinextras/hunter.cmake +++ b/cmake/projects/Qt/qtwinextras/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwinextras" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtx11extras/hunter.cmake b/cmake/projects/Qt/qtx11extras/hunter.cmake index 973534525d..1c0b959bc0 100644 --- a/cmake/projects/Qt/qtx11extras/hunter.cmake +++ b/cmake/projects/Qt/qtx11extras/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtx11extras" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) diff --git a/cmake/projects/Qt/qtxmlpatterns/hunter.cmake b/cmake/projects/Qt/qtxmlpatterns/hunter.cmake index 97534fff0a..002cc0d1a9 100644 --- a/cmake/projects/Qt/qtxmlpatterns/hunter.cmake +++ b/cmake/projects/Qt/qtxmlpatterns/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtxmlpatterns" - PACKAGE_INTERNAL_DEPS_ID "11" + PACKAGE_INTERNAL_DEPS_ID "12" ) From 5f063132e231399bc10007e7afabff5070dbf548 Mon Sep 17 00:00:00 2001 From: isaachier Date: Mon, 25 Sep 2017 13:02:53 -0400 Subject: [PATCH 0015/1014] Add Libevent package. (#1019) * Add Libevent package. * Fix doc format. * Add spelling fix. * Update version. * Update version. * Fix SHA1 hash. --- cmake/configs/default.cmake | 1 + cmake/projects/Libevent/hunter.cmake | 22 ++++++++++++++++++++++ docs/packages/networking.rst | 2 ++ docs/packages/pkg/Libevent.rst | 22 ++++++++++++++++++++++ examples/Libevent/CMakeLists.txt | 13 +++++++++++++ examples/Libevent/main.cpp | 7 +++++++ 6 files changed, 67 insertions(+) create mode 100644 cmake/projects/Libevent/hunter.cmake create mode 100644 docs/packages/pkg/Libevent.rst create mode 100644 examples/Libevent/CMakeLists.txt create mode 100644 examples/Libevent/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index f11cc5533f..0bcd1a21ad 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -82,6 +82,7 @@ hunter_config(Leathers VERSION 0.1.6) hunter_config(Leptonica VERSION 1.74.2-p4) hunter_config(Libcxx VERSION 3.6.2) # Clang hunter_config(Libcxxabi VERSION 3.6.2) # Clang +hunter_config(Libevent VERSION 2.1.8) hunter_config(libffi VERSION 3.2.1) hunter_config(librtmp VERSION 2.4.0-p0) hunter_config(Libssh2 VERSION 1.7.0) diff --git a/cmake/projects/Libevent/hunter.cmake b/cmake/projects/Libevent/hunter.cmake new file mode 100644 index 0000000000..83bddb7a1c --- /dev/null +++ b/cmake/projects/Libevent/hunter.cmake @@ -0,0 +1,22 @@ +# !!! 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 Libevent + VERSION "2.1.8" + URL "https://github.com/hunter-packages/libevent/archive/v2.1.8-p2.tar.gz" + SHA1 "492abb962dad3071f34bbe4975e28768fd29edf0") +hunter_cmake_args(Libevent CMAKE_ARGS + EVENT__DISABLE_TESTS=ON + EVENT__DISABLE_SAMPLES=ON + EVENT__DISABLE_REGRESS=ON + EVENT__DISABLE_BENCHMARK=ON) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(Libevent) +hunter_download(PACKAGE_NAME Libevent) diff --git a/docs/packages/networking.rst b/docs/packages/networking.rst index 0992bd5fd6..bc6ecf8430 100644 --- a/docs/packages/networking.rst +++ b/docs/packages/networking.rst @@ -4,6 +4,7 @@ DNS websocket Asio + scalable Networking ---------- @@ -13,6 +14,7 @@ Networking - :ref:`pkg.Beast` - HTTP and WebSocket built on Boost.Asio in C++11 - :ref:`pkg.CppNetlibUri` - C++ Network URI - :ref:`pkg.CURL` - A command line tool and library for transferring data with URL syntax + - :ref:`pkg.Libevent` - An event notification library for developing scalable network servers. - :ref:`pkg.Libssh2` - :ref:`pkg.PocoCpp` - Cross-platform C++ libraries with a network/internet focus. - :ref:`pkg.websocketpp` - C++ websocket client/server library diff --git a/docs/packages/pkg/Libevent.rst b/docs/packages/pkg/Libevent.rst new file mode 100644 index 0000000000..3f62652937 --- /dev/null +++ b/docs/packages/pkg/Libevent.rst @@ -0,0 +1,22 @@ +.. spelling:: + + Libevent + +.. index:: networking ; Libevent + +.. _pkg.Libevent: + +Libevent +======== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `Isaac Hier `__ (`pr-1019 `__) + +.. code-block:: cmake + + hunter_add_package(Libevent) + find_package(Libevent CONFIG REQUIRED) + target_link_libraries(... Libevent::event_core + Libevent::event_extra) diff --git a/examples/Libevent/CMakeLists.txt b/examples/Libevent/CMakeLists.txt new file mode 100644 index 0000000000..a51de1487f --- /dev/null +++ b/examples/Libevent/CMakeLists.txt @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 3.0) + +include("../common.cmake") + +project(download-libevent) + +hunter_add_package(Libevent) + +find_package(Libevent CONFIG REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main Libevent::event_core + Libevent::event_extra) diff --git a/examples/Libevent/main.cpp b/examples/Libevent/main.cpp new file mode 100644 index 0000000000..819586408a --- /dev/null +++ b/examples/Libevent/main.cpp @@ -0,0 +1,7 @@ +#include +#include + +int main() +{ + return 0; +} From 72bf47578ec2a50beabc610799229ccc36c93d67 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Mon, 25 Sep 2017 20:15:12 +0300 Subject: [PATCH 0016/1014] Qt Linux: Modify LD_LIBRARY_PATH --- cmake/projects/Qt/ep-stages/qt-build.cmake.in | 2 ++ cmake/projects/Qt/ep-stages/qt-configure.cmake.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cmake/projects/Qt/ep-stages/qt-build.cmake.in b/cmake/projects/Qt/ep-stages/qt-build.cmake.in index c4e631108c..404373afe6 100644 --- a/cmake/projects/Qt/ep-stages/qt-build.cmake.in +++ b/cmake/projects/Qt/ep-stages/qt-build.cmake.in @@ -31,6 +31,8 @@ if("@HUNTER_QT_OS_IS_LINUX@") set(x "@global_install_dir@/share/pkgconfig") set(y "@global_install_dir@/lib/pkgconfig") set(ENV{PKG_CONFIG_PATH} "${x}:${y}") + + set(ENV{LD_LIBRARY_PATH} "@global_install_dir@/lib") endif() execute_process(COMMAND ${build_command} @build_opts@ RESULT_VARIABLE result) diff --git a/cmake/projects/Qt/ep-stages/qt-configure.cmake.in b/cmake/projects/Qt/ep-stages/qt-configure.cmake.in index 59552db524..1340e9494c 100644 --- a/cmake/projects/Qt/ep-stages/qt-configure.cmake.in +++ b/cmake/projects/Qt/ep-stages/qt-configure.cmake.in @@ -49,6 +49,8 @@ if("@HUNTER_QT_OS_IS_LINUX@") set(x "@global_install_dir@/share/pkgconfig") set(y "@global_install_dir@/lib/pkgconfig") set(ENV{PKG_CONFIG_PATH} "${x}:${y}") + + set(ENV{LD_LIBRARY_PATH} "@global_install_dir@/lib") endif() list(APPEND CMAKE_MODULE_PATH "@hunter_self@/cmake/modules") From 5b8b42f78ad18159207feebdb3207d862c6c7719 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Mon, 25 Sep 2017 20:16:30 +0300 Subject: [PATCH 0017/1014] Qt: ++PACKAGE_INTERNAL_DEPS_ID --- cmake/projects/Qt/hunter.cmake.in | 2 +- cmake/projects/Qt/qt3d/hunter.cmake | 2 +- cmake/projects/Qt/qtactiveqt/hunter.cmake | 2 +- cmake/projects/Qt/qtandroidextras/hunter.cmake | 2 +- cmake/projects/Qt/qtbase/hunter.cmake | 2 +- cmake/projects/Qt/qtcanvas3d/hunter.cmake | 2 +- cmake/projects/Qt/qtcharts/hunter.cmake | 2 +- cmake/projects/Qt/qtconnectivity/hunter.cmake | 2 +- cmake/projects/Qt/qtdatavis3d/hunter.cmake | 2 +- cmake/projects/Qt/qtdeclarative/hunter.cmake | 2 +- cmake/projects/Qt/qtdoc/hunter.cmake | 2 +- cmake/projects/Qt/qtdocgallery/hunter.cmake | 2 +- cmake/projects/Qt/qtenginio/hunter.cmake | 2 +- cmake/projects/Qt/qtfeedback/hunter.cmake | 2 +- cmake/projects/Qt/qtgamepad/hunter.cmake | 2 +- cmake/projects/Qt/qtgraphicaleffects/hunter.cmake | 2 +- cmake/projects/Qt/qtimageformats/hunter.cmake | 2 +- cmake/projects/Qt/qtlocation/hunter.cmake | 2 +- cmake/projects/Qt/qtmacextras/hunter.cmake | 2 +- cmake/projects/Qt/qtmultimedia/hunter.cmake | 2 +- cmake/projects/Qt/qtnetworkauth/hunter.cmake | 2 +- cmake/projects/Qt/qtpim/hunter.cmake | 2 +- cmake/projects/Qt/qtpurchasing/hunter.cmake | 2 +- cmake/projects/Qt/qtqa/hunter.cmake | 2 +- cmake/projects/Qt/qtquick1/hunter.cmake | 2 +- cmake/projects/Qt/qtquickcontrols/hunter.cmake | 2 +- cmake/projects/Qt/qtquickcontrols2/hunter.cmake | 2 +- cmake/projects/Qt/qtremoteobjects/hunter.cmake | 2 +- cmake/projects/Qt/qtrepotools/hunter.cmake | 2 +- cmake/projects/Qt/qtscript/hunter.cmake | 2 +- cmake/projects/Qt/qtscxml/hunter.cmake | 2 +- cmake/projects/Qt/qtsensors/hunter.cmake | 2 +- cmake/projects/Qt/qtserialbus/hunter.cmake | 2 +- cmake/projects/Qt/qtserialport/hunter.cmake | 2 +- cmake/projects/Qt/qtspeech/hunter.cmake | 2 +- cmake/projects/Qt/qtsvg/hunter.cmake | 2 +- cmake/projects/Qt/qtsystems/hunter.cmake | 2 +- cmake/projects/Qt/qttools/hunter.cmake | 2 +- cmake/projects/Qt/qttranslations/hunter.cmake | 2 +- cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake | 2 +- cmake/projects/Qt/qtwayland/hunter.cmake | 2 +- cmake/projects/Qt/qtwebchannel/hunter.cmake | 2 +- cmake/projects/Qt/qtwebengine/hunter.cmake | 2 +- cmake/projects/Qt/qtwebkit-examples/hunter.cmake | 2 +- cmake/projects/Qt/qtwebkit/hunter.cmake | 2 +- cmake/projects/Qt/qtwebsockets/hunter.cmake | 2 +- cmake/projects/Qt/qtwebview/hunter.cmake | 2 +- cmake/projects/Qt/qtwinextras/hunter.cmake | 2 +- cmake/projects/Qt/qtx11extras/hunter.cmake | 2 +- cmake/projects/Qt/qtxmlpatterns/hunter.cmake | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/cmake/projects/Qt/hunter.cmake.in b/cmake/projects/Qt/hunter.cmake.in index 7176165782..43e619a3d5 100644 --- a/cmake/projects/Qt/hunter.cmake.in +++ b/cmake/projects/Qt/hunter.cmake.in @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "@qt_component@" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qt3d/hunter.cmake b/cmake/projects/Qt/qt3d/hunter.cmake index 4841bb39d2..8c8f69de65 100644 --- a/cmake/projects/Qt/qt3d/hunter.cmake +++ b/cmake/projects/Qt/qt3d/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qt3d" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtactiveqt/hunter.cmake b/cmake/projects/Qt/qtactiveqt/hunter.cmake index d82dbf6e19..6dcfd71df5 100644 --- a/cmake/projects/Qt/qtactiveqt/hunter.cmake +++ b/cmake/projects/Qt/qtactiveqt/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtactiveqt" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtandroidextras/hunter.cmake b/cmake/projects/Qt/qtandroidextras/hunter.cmake index b238489a0f..12f7864883 100644 --- a/cmake/projects/Qt/qtandroidextras/hunter.cmake +++ b/cmake/projects/Qt/qtandroidextras/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtandroidextras" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtbase/hunter.cmake b/cmake/projects/Qt/qtbase/hunter.cmake index a7cb0df1e1..38b875966f 100644 --- a/cmake/projects/Qt/qtbase/hunter.cmake +++ b/cmake/projects/Qt/qtbase/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtbase" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtcanvas3d/hunter.cmake b/cmake/projects/Qt/qtcanvas3d/hunter.cmake index 541645f505..3c3583a4e6 100644 --- a/cmake/projects/Qt/qtcanvas3d/hunter.cmake +++ b/cmake/projects/Qt/qtcanvas3d/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtcanvas3d" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtcharts/hunter.cmake b/cmake/projects/Qt/qtcharts/hunter.cmake index aacb637767..883ff741ec 100644 --- a/cmake/projects/Qt/qtcharts/hunter.cmake +++ b/cmake/projects/Qt/qtcharts/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtcharts" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtconnectivity/hunter.cmake b/cmake/projects/Qt/qtconnectivity/hunter.cmake index 7e3ef1a7a1..0f6fd179d8 100644 --- a/cmake/projects/Qt/qtconnectivity/hunter.cmake +++ b/cmake/projects/Qt/qtconnectivity/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtconnectivity" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtdatavis3d/hunter.cmake b/cmake/projects/Qt/qtdatavis3d/hunter.cmake index 9834bf791c..56bfad0ac6 100644 --- a/cmake/projects/Qt/qtdatavis3d/hunter.cmake +++ b/cmake/projects/Qt/qtdatavis3d/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtdatavis3d" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtdeclarative/hunter.cmake b/cmake/projects/Qt/qtdeclarative/hunter.cmake index baea9ea4d2..0af3da9923 100644 --- a/cmake/projects/Qt/qtdeclarative/hunter.cmake +++ b/cmake/projects/Qt/qtdeclarative/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtdeclarative" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtdoc/hunter.cmake b/cmake/projects/Qt/qtdoc/hunter.cmake index eee37bf930..1cda466009 100644 --- a/cmake/projects/Qt/qtdoc/hunter.cmake +++ b/cmake/projects/Qt/qtdoc/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtdoc" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtdocgallery/hunter.cmake b/cmake/projects/Qt/qtdocgallery/hunter.cmake index 6129489d3e..ee91c8b937 100644 --- a/cmake/projects/Qt/qtdocgallery/hunter.cmake +++ b/cmake/projects/Qt/qtdocgallery/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtdocgallery" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtenginio/hunter.cmake b/cmake/projects/Qt/qtenginio/hunter.cmake index 48a866488c..f9bacf7cf5 100644 --- a/cmake/projects/Qt/qtenginio/hunter.cmake +++ b/cmake/projects/Qt/qtenginio/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtenginio" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtfeedback/hunter.cmake b/cmake/projects/Qt/qtfeedback/hunter.cmake index 5ad2575843..3120c4f534 100644 --- a/cmake/projects/Qt/qtfeedback/hunter.cmake +++ b/cmake/projects/Qt/qtfeedback/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtfeedback" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtgamepad/hunter.cmake b/cmake/projects/Qt/qtgamepad/hunter.cmake index ea1416f04e..c0a6a8f689 100644 --- a/cmake/projects/Qt/qtgamepad/hunter.cmake +++ b/cmake/projects/Qt/qtgamepad/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtgamepad" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtgraphicaleffects/hunter.cmake b/cmake/projects/Qt/qtgraphicaleffects/hunter.cmake index 47fa83f0b3..e3191029d5 100644 --- a/cmake/projects/Qt/qtgraphicaleffects/hunter.cmake +++ b/cmake/projects/Qt/qtgraphicaleffects/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtgraphicaleffects" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtimageformats/hunter.cmake b/cmake/projects/Qt/qtimageformats/hunter.cmake index 4777fa0308..9dfbec964b 100644 --- a/cmake/projects/Qt/qtimageformats/hunter.cmake +++ b/cmake/projects/Qt/qtimageformats/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtimageformats" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtlocation/hunter.cmake b/cmake/projects/Qt/qtlocation/hunter.cmake index 0c7ba8b388..4e29a4ae6c 100644 --- a/cmake/projects/Qt/qtlocation/hunter.cmake +++ b/cmake/projects/Qt/qtlocation/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtlocation" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtmacextras/hunter.cmake b/cmake/projects/Qt/qtmacextras/hunter.cmake index 2825f33d82..b0dfa7dca8 100644 --- a/cmake/projects/Qt/qtmacextras/hunter.cmake +++ b/cmake/projects/Qt/qtmacextras/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtmacextras" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtmultimedia/hunter.cmake b/cmake/projects/Qt/qtmultimedia/hunter.cmake index 2f76626407..b1bc687572 100644 --- a/cmake/projects/Qt/qtmultimedia/hunter.cmake +++ b/cmake/projects/Qt/qtmultimedia/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtmultimedia" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtnetworkauth/hunter.cmake b/cmake/projects/Qt/qtnetworkauth/hunter.cmake index 6ead10e813..9dfc0780e7 100644 --- a/cmake/projects/Qt/qtnetworkauth/hunter.cmake +++ b/cmake/projects/Qt/qtnetworkauth/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtnetworkauth" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtpim/hunter.cmake b/cmake/projects/Qt/qtpim/hunter.cmake index cb9f87309f..e132f85cb2 100644 --- a/cmake/projects/Qt/qtpim/hunter.cmake +++ b/cmake/projects/Qt/qtpim/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtpim" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtpurchasing/hunter.cmake b/cmake/projects/Qt/qtpurchasing/hunter.cmake index 0f8095863a..0b058ca23a 100644 --- a/cmake/projects/Qt/qtpurchasing/hunter.cmake +++ b/cmake/projects/Qt/qtpurchasing/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtpurchasing" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtqa/hunter.cmake b/cmake/projects/Qt/qtqa/hunter.cmake index 07f0fd82da..0e46c3d5fa 100644 --- a/cmake/projects/Qt/qtqa/hunter.cmake +++ b/cmake/projects/Qt/qtqa/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtqa" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtquick1/hunter.cmake b/cmake/projects/Qt/qtquick1/hunter.cmake index adc11c0285..80372c070b 100644 --- a/cmake/projects/Qt/qtquick1/hunter.cmake +++ b/cmake/projects/Qt/qtquick1/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtquick1" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtquickcontrols/hunter.cmake b/cmake/projects/Qt/qtquickcontrols/hunter.cmake index 2aaf139087..2e20def6f3 100644 --- a/cmake/projects/Qt/qtquickcontrols/hunter.cmake +++ b/cmake/projects/Qt/qtquickcontrols/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtquickcontrols" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtquickcontrols2/hunter.cmake b/cmake/projects/Qt/qtquickcontrols2/hunter.cmake index 9d784f3fba..da411a7e46 100644 --- a/cmake/projects/Qt/qtquickcontrols2/hunter.cmake +++ b/cmake/projects/Qt/qtquickcontrols2/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtquickcontrols2" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtremoteobjects/hunter.cmake b/cmake/projects/Qt/qtremoteobjects/hunter.cmake index 44bee6d89f..cc02ebb72a 100644 --- a/cmake/projects/Qt/qtremoteobjects/hunter.cmake +++ b/cmake/projects/Qt/qtremoteobjects/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtremoteobjects" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtrepotools/hunter.cmake b/cmake/projects/Qt/qtrepotools/hunter.cmake index a37d94823f..186f1f0b82 100644 --- a/cmake/projects/Qt/qtrepotools/hunter.cmake +++ b/cmake/projects/Qt/qtrepotools/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtrepotools" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtscript/hunter.cmake b/cmake/projects/Qt/qtscript/hunter.cmake index 6a515a0ca7..e2a7da8adf 100644 --- a/cmake/projects/Qt/qtscript/hunter.cmake +++ b/cmake/projects/Qt/qtscript/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtscript" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtscxml/hunter.cmake b/cmake/projects/Qt/qtscxml/hunter.cmake index d17be66551..afc8ed2999 100644 --- a/cmake/projects/Qt/qtscxml/hunter.cmake +++ b/cmake/projects/Qt/qtscxml/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtscxml" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtsensors/hunter.cmake b/cmake/projects/Qt/qtsensors/hunter.cmake index cf2acf16b9..5c22d87ffa 100644 --- a/cmake/projects/Qt/qtsensors/hunter.cmake +++ b/cmake/projects/Qt/qtsensors/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtsensors" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtserialbus/hunter.cmake b/cmake/projects/Qt/qtserialbus/hunter.cmake index 979b4bf54c..82e5204595 100644 --- a/cmake/projects/Qt/qtserialbus/hunter.cmake +++ b/cmake/projects/Qt/qtserialbus/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtserialbus" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtserialport/hunter.cmake b/cmake/projects/Qt/qtserialport/hunter.cmake index fec003e9e6..b4fe639c02 100644 --- a/cmake/projects/Qt/qtserialport/hunter.cmake +++ b/cmake/projects/Qt/qtserialport/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtserialport" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtspeech/hunter.cmake b/cmake/projects/Qt/qtspeech/hunter.cmake index 332f32e542..93ba95f736 100644 --- a/cmake/projects/Qt/qtspeech/hunter.cmake +++ b/cmake/projects/Qt/qtspeech/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtspeech" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtsvg/hunter.cmake b/cmake/projects/Qt/qtsvg/hunter.cmake index dc1586a430..57b11ca541 100644 --- a/cmake/projects/Qt/qtsvg/hunter.cmake +++ b/cmake/projects/Qt/qtsvg/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtsvg" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtsystems/hunter.cmake b/cmake/projects/Qt/qtsystems/hunter.cmake index e16175cfb3..3fc05b084e 100644 --- a/cmake/projects/Qt/qtsystems/hunter.cmake +++ b/cmake/projects/Qt/qtsystems/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtsystems" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qttools/hunter.cmake b/cmake/projects/Qt/qttools/hunter.cmake index c8f88293cc..cfb37aa740 100644 --- a/cmake/projects/Qt/qttools/hunter.cmake +++ b/cmake/projects/Qt/qttools/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qttools" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qttranslations/hunter.cmake b/cmake/projects/Qt/qttranslations/hunter.cmake index e21a4dab4a..4cb8f7979b 100644 --- a/cmake/projects/Qt/qttranslations/hunter.cmake +++ b/cmake/projects/Qt/qttranslations/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qttranslations" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake b/cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake index 833d88b0b0..2ae782a1ac 100644 --- a/cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake +++ b/cmake/projects/Qt/qtvirtualkeyboard/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtvirtualkeyboard" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtwayland/hunter.cmake b/cmake/projects/Qt/qtwayland/hunter.cmake index 337e721fc7..3445788f18 100644 --- a/cmake/projects/Qt/qtwayland/hunter.cmake +++ b/cmake/projects/Qt/qtwayland/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwayland" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtwebchannel/hunter.cmake b/cmake/projects/Qt/qtwebchannel/hunter.cmake index 0c4621ab47..82f5790191 100644 --- a/cmake/projects/Qt/qtwebchannel/hunter.cmake +++ b/cmake/projects/Qt/qtwebchannel/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebchannel" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtwebengine/hunter.cmake b/cmake/projects/Qt/qtwebengine/hunter.cmake index 958c3de6c6..03bb09aabb 100644 --- a/cmake/projects/Qt/qtwebengine/hunter.cmake +++ b/cmake/projects/Qt/qtwebengine/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebengine" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtwebkit-examples/hunter.cmake b/cmake/projects/Qt/qtwebkit-examples/hunter.cmake index 8b5cbb3c99..1e88a4e1c0 100644 --- a/cmake/projects/Qt/qtwebkit-examples/hunter.cmake +++ b/cmake/projects/Qt/qtwebkit-examples/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebkit-examples" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtwebkit/hunter.cmake b/cmake/projects/Qt/qtwebkit/hunter.cmake index 1c1ed840fa..6075d8b075 100644 --- a/cmake/projects/Qt/qtwebkit/hunter.cmake +++ b/cmake/projects/Qt/qtwebkit/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebkit" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtwebsockets/hunter.cmake b/cmake/projects/Qt/qtwebsockets/hunter.cmake index 4871105e74..9bcf8d94b4 100644 --- a/cmake/projects/Qt/qtwebsockets/hunter.cmake +++ b/cmake/projects/Qt/qtwebsockets/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebsockets" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtwebview/hunter.cmake b/cmake/projects/Qt/qtwebview/hunter.cmake index 13f2e7e96a..fc0c96aca4 100644 --- a/cmake/projects/Qt/qtwebview/hunter.cmake +++ b/cmake/projects/Qt/qtwebview/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwebview" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtwinextras/hunter.cmake b/cmake/projects/Qt/qtwinextras/hunter.cmake index 9d87090f9b..b0b641aa2e 100644 --- a/cmake/projects/Qt/qtwinextras/hunter.cmake +++ b/cmake/projects/Qt/qtwinextras/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtwinextras" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtx11extras/hunter.cmake b/cmake/projects/Qt/qtx11extras/hunter.cmake index 1c0b959bc0..82c00c1655 100644 --- a/cmake/projects/Qt/qtx11extras/hunter.cmake +++ b/cmake/projects/Qt/qtx11extras/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtx11extras" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) diff --git a/cmake/projects/Qt/qtxmlpatterns/hunter.cmake b/cmake/projects/Qt/qtxmlpatterns/hunter.cmake index 002cc0d1a9..df8a224562 100644 --- a/cmake/projects/Qt/qtxmlpatterns/hunter.cmake +++ b/cmake/projects/Qt/qtxmlpatterns/hunter.cmake @@ -134,5 +134,5 @@ hunter_pick_scheme(DEFAULT url_sha1_qt) hunter_download( PACKAGE_NAME Qt PACKAGE_COMPONENT "qtxmlpatterns" - PACKAGE_INTERNAL_DEPS_ID "12" + PACKAGE_INTERNAL_DEPS_ID "13" ) From 55905b532575bb32f17aeb8b02ef0e9df7d45e00 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 26 Sep 2017 01:48:19 +0300 Subject: [PATCH 0018/1014] Qt: Android r15c uploading script [skip ci] --- .../local-upload/qt/linux/android-r15c.sh | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 maintenance/local-upload/qt/linux/android-r15c.sh diff --git a/maintenance/local-upload/qt/linux/android-r15c.sh b/maintenance/local-upload/qt/linux/android-r15c.sh new file mode 100755 index 0000000000..cc77d5de97 --- /dev/null +++ b/maintenance/local-upload/qt/linux/android-r15c.sh @@ -0,0 +1,22 @@ +#!/bin/bash -e + +set -x + +[ "${GITHUB_USER_PASSWORD}" = "" ] && { echo "GITHUB_USER_PASSWORD is not set"; exit 1; } +[ "${ANDROID_NDK_r15c}" = "" ] && { echo "ANDROID_NDK_r15c is not set"; exit 1; } + +export GITHUB_USER_PASSWORD + +THIS_SCRIPT_DIR=`dirname "${BASH_SOURCE[0]}"` + +cd "${THIS_SCRIPT_DIR}/../../../.." + +# { +export TOOLCHAIN=android-ndk-r15c-api-21-armeabi-v7a-neon-clang-libcxx +PROJECT_DIR=examples/qt-widgets ./jenkins.py --clear-except-download +PROJECT_DIR=examples/qt-camera ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-location ./jenkins.py --nocreate +PROJECT_DIR=examples/qt-qml ./jenkins.py --upload --nocreate +# } + +echo "Done" From 5ad9fbe4b6df7741c39518bba58b0ef5b2322f8a Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 22 Sep 2017 16:04:43 +0300 Subject: [PATCH 0019/1014] OpenSSL: Support OpenWRT --- cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in b/cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in index 7a121ca5e0..8942a14070 100644 --- a/cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in +++ b/cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in @@ -32,7 +32,7 @@ hunter_test_string_not_empty("@HUNTER_GLOBAL_SCRIPT_DIR@") if(APPLE) set(configure_command "./Configure") set(configure_opts "darwin64-x86_64-cc") -elseif(ANDROID OR RASPBERRY_PI) +elseif(ANDROID OR RASPBERRY_PI OR OPENWRT) # -> CMAKE_AR # -> CMAKE_RANLIB hunter_pick_archiver() @@ -92,6 +92,8 @@ if(ANDROID) list(APPEND configure_opts "-latomic") elseif(RASPBERRY_PI) set(configure_opts "linux-generic32") +elseif(OPENWRT) + set(configure_opts "linux-generic32" "no-async") endif() # Pass C compiler through From 99c61b73ba872327e6198cc120a1c213a4ff8bdb Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 22 Sep 2017 16:26:33 +0300 Subject: [PATCH 0020/1014] CURL: Support OpenWRT --- cmake/projects/CURL/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/CURL/hunter.cmake b/cmake/projects/CURL/hunter.cmake index 54f55aae6b..2323ea7682 100644 --- a/cmake/projects/CURL/hunter.cmake +++ b/cmake/projects/CURL/hunter.cmake @@ -43,7 +43,7 @@ hunter_add_version( 3ac2684e3274c17ca209731e121e9a0acc79e4a5 ) -if (ANDROID OR IOS OR RASPBERRY_PI) +if (ANDROID OR IOS OR RASPBERRY_PI OR OPENWRT) set(_curl_cmake_args HAVE_GLIBC_STRERROR_R=1 HAVE_GLIBC_STRERROR_R__TRYRUN_OUTPUT="" From a63c675593cce391550162ff15720f9122aa38d9 Mon Sep 17 00:00:00 2001 From: isaachier Date: Wed, 27 Sep 2017 04:22:09 -0400 Subject: [PATCH 0021/1014] Gumbo (#1062) --- cmake/configs/default.cmake | 1 + cmake/projects/gumbo/hunter.cmake | 19 +++++++++++++++++++ docs/packages/pkg/gumbo.rst | 21 +++++++++++++++++++++ docs/packages/serialize.rst | 1 + examples/gumbo/CMakeLists.txt | 12 ++++++++++++ examples/gumbo/main.cpp | 6 ++++++ 6 files changed, 60 insertions(+) create mode 100644 cmake/projects/gumbo/hunter.cmake create mode 100644 docs/packages/pkg/gumbo.rst create mode 100644 examples/gumbo/CMakeLists.txt create mode 100644 examples/gumbo/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 0bcd1a21ad..3cd08ab98f 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -189,6 +189,7 @@ hunter_config(gst_plugins_base VERSION 1.10.4) hunter_config(gst_plugins_good VERSION 1.10.4) hunter_config(gst_plugins_ugly VERSION 1.10.4) hunter_config(gstreamer VERSION 1.10.4) +hunter_config(gumbo VERSION 0.10.1) hunter_config(half VERSION 1.1.0-p1) hunter_config(hdf5 VERSION 1.8.15-p1) hunter_config(ice VERSION 1.0.8) diff --git a/cmake/projects/gumbo/hunter.cmake b/cmake/projects/gumbo/hunter.cmake new file mode 100644 index 0000000000..dfa647ccc1 --- /dev/null +++ b/cmake/projects/gumbo/hunter.cmake @@ -0,0 +1,19 @@ +# !!! 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 gumbo + VERSION "0.10.1" + URL "https://github.com/hunter-packages/gumbo-parser/archive/hunter-0.10.1.tar.gz" + SHA1 "0b060d7b67f605fc2c06a2c474fbd00ad5c48b18") + +hunter_cmake_args(gumbo CMAKE_ARGS BUILD_TESTING=OFF) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(gumbo) +hunter_download(PACKAGE_NAME gumbo) diff --git a/docs/packages/pkg/gumbo.rst b/docs/packages/pkg/gumbo.rst new file mode 100644 index 0000000000..996426a1c2 --- /dev/null +++ b/docs/packages/pkg/gumbo.rst @@ -0,0 +1,21 @@ +.. spelling:: + + gumbo + +.. index:: serialization ; gumbo + +.. _pkg.gumbo: + +gumbo +===== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `Isaac Hier `__ (`pr-1062 `__) + +.. code-block:: cmake + + hunter_add_package(gumbo) + find_package(gumbo CONFIG REQUIRED) + target_link_libraries(... gumbo::gumbo) diff --git a/docs/packages/serialize.rst b/docs/packages/serialize.rst index 32701e1f10..58995c6c3c 100644 --- a/docs/packages/serialize.rst +++ b/docs/packages/serialize.rst @@ -10,6 +10,7 @@ Serialize * :ref:`pkg.CsvParserCPlusPlus` - C++ library for parsing text files. * :ref:`pkg.Expat` - XML parser library in C. * :ref:`pkg.flatbuffers` - Memory Efficient Serialization Library + * :ref:`pkg.gumbo` - An HTML5 parsing library in pure C99 * :ref:`pkg.irrXML` - simple and fast open source xml parser for C++ * :ref:`pkg.JsonSpirit` - C++ JSON Library including both a json-data-structure and parser (based on Boost.Spirit>`. * :ref:`pkg.msgpack` - efficient binary serialization format. diff --git a/examples/gumbo/CMakeLists.txt b/examples/gumbo/CMakeLists.txt new file mode 100644 index 0000000000..addc9b7b71 --- /dev/null +++ b/examples/gumbo/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.1) + +include("../common.cmake") + +project(download-gumbo) + +hunter_add_package(gumbo) + +find_package(gumbo CONFIG REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main gumbo::gumbo) diff --git a/examples/gumbo/main.cpp b/examples/gumbo/main.cpp new file mode 100644 index 0000000000..ae6c224559 --- /dev/null +++ b/examples/gumbo/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + return 0; +} From 0bde584e58bed19489fe8f787c0f70f48d110bfe Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Wed, 27 Sep 2017 17:03:08 +0300 Subject: [PATCH 0022/1014] xxf86vm: Generate CMake config [skip ci] --- cmake/projects/xxf86vm/hunter.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/projects/xxf86vm/hunter.cmake b/cmake/projects/xxf86vm/hunter.cmake index 54df9fb1ad..9db02f0446 100644 --- a/cmake/projects/xxf86vm/hunter.cmake +++ b/cmake/projects/xxf86vm/hunter.cmake @@ -34,8 +34,9 @@ set(xxf86vm_dependencies ) hunter_cmake_args( xxf86vm - CMAKE_ARGS # do not use double quotes on CMAKE_ARGS - DEPENDS_ON_PACKAGES=${xxf86vm_dependencies} + CMAKE_ARGS + DEPENDS_ON_PACKAGES=${xxf86vm_dependencies} + PKGCONFIG_EXPORT_TARGETS=xxf86vm ) hunter_cacheable(xxf86vm) hunter_download( From 92272497a18566243c51e43ea742201bfd69235e Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Wed, 27 Sep 2017 18:48:23 +0300 Subject: [PATCH 0023/1014] xf86vidmodeproto: Generate CMake config --- cmake/projects/xf86vidmodeproto/hunter.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/projects/xf86vidmodeproto/hunter.cmake b/cmake/projects/xf86vidmodeproto/hunter.cmake index 9986447fa1..40b3c1cafd 100644 --- a/cmake/projects/xf86vidmodeproto/hunter.cmake +++ b/cmake/projects/xf86vidmodeproto/hunter.cmake @@ -29,8 +29,9 @@ set(xf86vidmodeproto_dependencies ) hunter_cmake_args( xf86vidmodeproto - CMAKE_ARGS # do not use double quotes on CMAKE_ARGS - DEPENDS_ON_PACKAGES=${xf86vidmodeproto_dependencies} + CMAKE_ARGS + DEPENDS_ON_PACKAGES=${xf86vidmodeproto_dependencies} + PKGCONFIG_EXPORT_TARGETS=xf86vidmodeproto ) hunter_cacheable(xf86vidmodeproto) hunter_download( From 64ce65719d28cc841d834cd5b813038effc1b128 Mon Sep 17 00:00:00 2001 From: isaachier Date: Wed, 27 Sep 2017 17:42:58 -0400 Subject: [PATCH 0024/1014] Add libmill. (#1063) --- cmake/configs/default.cmake | 1 + cmake/projects/libmill/hunter.cmake | 20 ++++++++++++++++++++ docs/packages/concurrency.rst | 2 ++ docs/packages/pkg/libmill.rst | 22 ++++++++++++++++++++++ examples/libmill/CMakeLists.txt | 12 ++++++++++++ examples/libmill/main.cpp | 6 ++++++ 6 files changed, 63 insertions(+) create mode 100644 cmake/projects/libmill/hunter.cmake create mode 100644 docs/packages/pkg/libmill.rst create mode 100644 examples/libmill/CMakeLists.txt create mode 100644 examples/libmill/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 3cd08ab98f..a2b209c339 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -202,6 +202,7 @@ hunter_config(irrXML VERSION 1.2) hunter_config(kbproto VERSION 1.0.6) hunter_config(libdaemon VERSION 0.14) hunter_config(libjson-rpc-cpp VERSION 0.7.0-p3) +hunter_config(libmill VERSION 1.18) hunter_config(libogg VERSION 1.3.2-cmake3) hunter_config(libsodium VERSION 1.0.10) hunter_config(libuv VERSION 1.14.0-p1) diff --git a/cmake/projects/libmill/hunter.cmake b/cmake/projects/libmill/hunter.cmake new file mode 100644 index 0000000000..d66b2290f1 --- /dev/null +++ b/cmake/projects/libmill/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 libmill + VERSION "1.18" + URL "https://github.com/hunter-packages/libmill/archive/hunter-1.18.tar.gz" + SHA1 "447807f84cbd3369d3031b394e0941574e01b08a") +hunter_cmake_args(libmill CMAKE_ARGS + BUILD_TESTING=OFF + BUILD_PERF=OFF) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(libmill) +hunter_download(PACKAGE_NAME libmill) diff --git a/docs/packages/concurrency.rst b/docs/packages/concurrency.rst index f06b3893d9..ec6a05d160 100644 --- a/docs/packages/concurrency.rst +++ b/docs/packages/concurrency.rst @@ -4,6 +4,7 @@ HPC GPGPU GPU + libmill Concurrency ----------- @@ -12,6 +13,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.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 - :ref:`pkg.OpenCL-cpp` - header only OpenCL c++ wrappers diff --git a/docs/packages/pkg/libmill.rst b/docs/packages/pkg/libmill.rst new file mode 100644 index 0000000000..3e65b2bddf --- /dev/null +++ b/docs/packages/pkg/libmill.rst @@ -0,0 +1,22 @@ +.. spelling:: + + libmill + +.. index:: concurrency ; libmill + +.. _pkg.libmill: + +libmill +======= + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `Isaac Hier `__ (`pr-1063 `__) + +.. code-block:: cmake + + hunter_add_package(libmill) + find_package(libmill CONFIG REQUIRED) + # `mill_s` is static library, `mill` is shared library + target_link_libraries(libmill libmill::mill_s) diff --git a/examples/libmill/CMakeLists.txt b/examples/libmill/CMakeLists.txt new file mode 100644 index 0000000000..d994efbabc --- /dev/null +++ b/examples/libmill/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.0) + +include("../common.cmake") + +project(download-libevent) + +hunter_add_package(libmill) + +find_package(libmill CONFIG REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main libmill::mill_s) diff --git a/examples/libmill/main.cpp b/examples/libmill/main.cpp new file mode 100644 index 0000000000..8ecf195710 --- /dev/null +++ b/examples/libmill/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + return 0; +} From cd4908b70126172e2ecd41c6d31df781174d0841 Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Thu, 28 Sep 2017 13:02:17 -0400 Subject: [PATCH 0025/1014] 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 0026/1014] 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 36896f7138f38a1f6ccf7abf619e4cb4ba5f1eb6 Mon Sep 17 00:00:00 2001 From: isaachier Date: Thu, 28 Sep 2017 13:25:59 -0400 Subject: [PATCH 0027/1014] Thrift (#1064) --- cmake/configs/default.cmake | 1 + cmake/projects/thrift/hunter.cmake | 28 ++++++++++++++++++++++++++++ docs/packages/pkg/thrift.rst | 24 ++++++++++++++++++++++++ docs/packages/serialize.rst | 2 ++ examples/thrift/CMakeLists.txt | 12 ++++++++++++ examples/thrift/main.cpp | 6 ++++++ 6 files changed, 73 insertions(+) create mode 100644 cmake/projects/thrift/hunter.cmake create mode 100644 docs/packages/pkg/thrift.rst create mode 100644 examples/thrift/CMakeLists.txt create mode 100644 examples/thrift/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index a2b209c339..820e5d0f14 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -249,6 +249,7 @@ endif() hunter_config(szip VERSION 2.1.0-p1) hunter_config(Tesseract VERSION 3.05.01-hunter-3) hunter_config(thread-pool-cpp VERSION 1.1.0) +hunter_config(thrift VERSION 0.10.0) hunter_config(tinydir VERSION 1.2-p0) hunter_config(util_linux VERSION 2.30.1) hunter_config(websocketpp VERSION 0.7.0-p2) diff --git a/cmake/projects/thrift/hunter.cmake b/cmake/projects/thrift/hunter.cmake new file mode 100644 index 0000000000..1a274e42c4 --- /dev/null +++ b/cmake/projects/thrift/hunter.cmake @@ -0,0 +1,28 @@ +# !!! 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 thrift + VERSION "0.10.0" + URL "https://github.com/hunter-packages/thrift/archive/v0.10.0-p0.tar.gz" + SHA1 "e346fd04d2228e4d08df363b4f260d92d12e7b67") + +hunter_cmake_args(thrift CMAKE_ARGS + BUILD_TESTING=OFF + BUILD_TUTORIALS=OFF + BUILD_HASKELL=OFF + BUILD_JAVA=OFF + BUILD_C_GLIB=OFF + WITH_QT4=OFF + WITH_QT5=OFF + WITH_SHARED_LIB=OFF + WITH_PLUGIN=OFF) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(thrift) +hunter_download(PACKAGE_NAME thrift) diff --git a/docs/packages/pkg/thrift.rst b/docs/packages/pkg/thrift.rst new file mode 100644 index 0000000000..fbcc44bb4d --- /dev/null +++ b/docs/packages/pkg/thrift.rst @@ -0,0 +1,24 @@ +.. spelling:: + + thrift + +.. index:: serialize ; thrift + +.. _pkg.thrift: + +thrift +====== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `isaachier `__ (`pr-1064 `__) + +.. code-block:: cmake + + hunter_add_package(thrift) + find_package(thrift CONFIG REQUIRED) + target_link_libraries(foo + thrift::thrift_static # Main thrift library + thrift::thriftz_static # thrift ZLIB support + thrift::thriftnb_static) # thrift Libevent non-blocking support diff --git a/docs/packages/serialize.rst b/docs/packages/serialize.rst index 58995c6c3c..2e09eb1755 100644 --- a/docs/packages/serialize.rst +++ b/docs/packages/serialize.rst @@ -2,6 +2,7 @@ json deserialization + scalable Serialize --------- @@ -19,5 +20,6 @@ Serialize * :ref:`pkg.Protobuf` - Protocol Buffers - Google's data interchange format * :ref:`pkg.RapidJSON` - A fast JSON parser/generator for C++ with both SAX/DOM style API * :ref:`pkg.RapidXML` - attempt to create the fastest XML parser possible, while retaining usability, portability and reasonable W3C compatibility. + * :ref:`pkg.thrift` - software framework for scalable cross-language services development * :ref:`pkg.yaml-cpp` - human friendly data serialization standard for all programming languages. * :ref:`pkg.jsoncpp` - A library that allows manipulating JSON values, including serialization and deserialization to and from strings. diff --git a/examples/thrift/CMakeLists.txt b/examples/thrift/CMakeLists.txt new file mode 100644 index 0000000000..ed08bd3562 --- /dev/null +++ b/examples/thrift/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.1) + +include("../common.cmake") + +project(download-thrift) + +hunter_add_package(thrift) + +find_package(thrift CONFIG REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main thrift::thrift_static) diff --git a/examples/thrift/main.cpp b/examples/thrift/main.cpp new file mode 100644 index 0000000000..9d13730a69 --- /dev/null +++ b/examples/thrift/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + return 0; +} From 5d763bb72fbe1408efd332543613f02f12aabc82 Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Thu, 28 Sep 2017 14:52:29 -0400 Subject: [PATCH 0028/1014] 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 0029/1014] 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 49a27fe724ea8b03614cabc9932a61b2e4f41a18 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Thu, 28 Sep 2017 16:50:54 +0300 Subject: [PATCH 0030/1014] Add 'HUNTER_BUILD_SHARED_LIBS' --- .../modules/hunter_apply_gate_settings.cmake | 8 +++++++ .../hunter_calculate_toolchain_sha1.cmake | 5 +++++ cmake/modules/hunter_check_flush_needed.cmake | 14 +++++++++++++ cmake/modules/hunter_create_cache_file.cmake | 5 +++++ cmake/modules/hunter_download.cmake | 21 +++++++++++++++---- cmake/modules/hunter_finalize.cmake | 3 +++ cmake/modules/hunter_initialize.cmake | 1 + docs/reference/user-variables.rst | 7 +++++++ scripts/create-toolchain-info.cmake | 9 ++++++++ 9 files changed, 69 insertions(+), 4 deletions(-) diff --git a/cmake/modules/hunter_apply_gate_settings.cmake b/cmake/modules/hunter_apply_gate_settings.cmake index ec8b770bcb..c12da3c9fd 100644 --- a/cmake/modules/hunter_apply_gate_settings.cmake +++ b/cmake/modules/hunter_apply_gate_settings.cmake @@ -110,6 +110,7 @@ function(hunter_apply_gate_settings) # * defines: HUNTER_GATE_TOOLCHAIN_SHA1 # * needs: HUNTER_CONFIGURATION_TYPES + # * needs: HUNTER_BUILD_SHARED_LIBS # * creates: global_toolchain_info at # "${hunter_base}/${HUNTER_GATE_SHA1}/${HUNTER_GATE_TOOLCHAIN_SHA1}/toolchain.info" hunter_calculate_toolchain_sha1("${hunter_self}" "${hunter_base}") @@ -183,4 +184,11 @@ function(hunter_apply_gate_settings) "" ) endforeach() + set( + HUNTER_CACHED_BUILD_SHARED_LIBS + "${HUNTER_BUILD_SHARED_LIBS}" + CACHE + INTERNAL + "" + ) endfunction() diff --git a/cmake/modules/hunter_calculate_toolchain_sha1.cmake b/cmake/modules/hunter_calculate_toolchain_sha1.cmake index 0d2fd88fc1..0283ead0ec 100644 --- a/cmake/modules/hunter_calculate_toolchain_sha1.cmake +++ b/cmake/modules/hunter_calculate_toolchain_sha1.cmake @@ -88,6 +88,11 @@ function(hunter_calculate_toolchain_sha1 hunter_self hunter_base) ) endforeach() + string(COMPARE EQUAL "${HUNTER_BUILD_SHARED_LIBS}" "" is_empty) + if(NOT is_empty) + list(APPEND cmd "-DHUNTER_BUILD_SHARED_LIBS=${HUNTER_BUILD_SHARED_LIBS}") + endif() + hunter_print_cmd("${temp_project_dir}" "${cmd}") # HUNTER_CONFIGURATION_TYPES notes: list is tricky... diff --git a/cmake/modules/hunter_check_flush_needed.cmake b/cmake/modules/hunter_check_flush_needed.cmake index c6ad21dfd8..ee380afeb2 100644 --- a/cmake/modules/hunter_check_flush_needed.cmake +++ b/cmake/modules/hunter_check_flush_needed.cmake @@ -66,6 +66,20 @@ function(hunter_check_flush_needed hunter_self flush_done) set(flush TRUE) endif() + string( + COMPARE + EQUAL + "${HUNTER_BUILD_SHARED_LIBS}" + "${HUNTER_CACHED_BUILD_SHARED_LIBS}" + is_ok + ) + if(NOT is_ok) + hunter_status_debug("HUNTER_BUILD_SHARED_LIBS changed:") + hunter_status_debug(" ${HUNTER_BUILD_SHARED_LIBS}") + hunter_status_debug(" ${HUNTER_CACHED_BUILD_SHARED_LIBS}") + set(flush TRUE) + endif() + if(NOT flush) set("${flush_done}" FALSE PARENT_SCOPE) return() diff --git a/cmake/modules/hunter_create_cache_file.cmake b/cmake/modules/hunter_create_cache_file.cmake index 86340bc402..f7986dd382 100644 --- a/cmake/modules/hunter_create_cache_file.cmake +++ b/cmake/modules/hunter_create_cache_file.cmake @@ -177,6 +177,11 @@ function(hunter_create_cache_file cache_path) "${temp_path}" "set(HUNTER_CACHED_CONFIGURATION_TYPES \"${HUNTER_CACHED_CONFIGURATION_TYPES}\" CACHE INTERNAL \"\")\n" ) + file( + APPEND + "${temp_path}" + "set(HUNTER_CACHED_BUILD_SHARED_LIBS \"${HUNTER_CACHED_BUILD_SHARED_LIBS}\" CACHE INTERNAL \"\")\n" + ) # CMP0069 should be set to NEW so we can build old projects with LTO # without modifying source code diff --git a/cmake/modules/hunter_download.cmake b/cmake/modules/hunter_download.cmake index b6c8abd5c5..5fae3cb411 100644 --- a/cmake/modules/hunter_download.cmake +++ b/cmake/modules/hunter_download.cmake @@ -311,11 +311,24 @@ function(hunter_download) endif() # load from cache using SHA1 of args.cmake file + set(package_cmake_args "") + list(APPEND package_cmake_args ${HUNTER_${h_name}_DEFAULT_CMAKE_ARGS}) + + # Priority is higher than default CMAKE_ARGS from `hunter.cmake` but + # lower than user's CMAKE_ARGS from `config.cmake`. + string(COMPARE EQUAL "${HUNTER_CACHED_BUILD_SHARED_LIBS}" "" is_empty) + if(NOT is_empty) + list( + APPEND + package_cmake_args + "BUILD_SHARED_LIBS=${HUNTER_CACHED_BUILD_SHARED_LIBS}" + ) + endif() + + list(APPEND package_cmake_args ${HUNTER_${h_name}_CMAKE_ARGS}) + file(REMOVE "${HUNTER_ARGS_FILE}") - hunter_create_args_file( - "${HUNTER_${h_name}_DEFAULT_CMAKE_ARGS};${HUNTER_${h_name}_CMAKE_ARGS}" - "${HUNTER_ARGS_FILE}" - ) + hunter_create_args_file("${package_cmake_args}" "${HUNTER_ARGS_FILE}") # Check if package can be loaded from cache hunter_load_from_cache() diff --git a/cmake/modules/hunter_finalize.cmake b/cmake/modules/hunter_finalize.cmake index 20d15aed02..73d998ca7f 100644 --- a/cmake/modules/hunter_finalize.cmake +++ b/cmake/modules/hunter_finalize.cmake @@ -95,6 +95,9 @@ macro(hunter_finalize) hunter_status_debug( "HUNTER_CONFIGURATION_TYPES: ${HUNTER_CACHED_CONFIGURATION_TYPES}" ) + hunter_status_debug( + "HUNTER_BUILD_SHARED_LIBS: ${HUNTER_BUILD_SHARED_LIBS}" + ) set(_id_info "[ Hunter-ID: ${HUNTER_ID} |") set(_id_info "${_id_info} Toolchain-ID: ${HUNTER_TOOLCHAIN_ID} |") diff --git a/cmake/modules/hunter_initialize.cmake b/cmake/modules/hunter_initialize.cmake index 6fe5b347b2..8dbf3bb6cc 100644 --- a/cmake/modules/hunter_initialize.cmake +++ b/cmake/modules/hunter_initialize.cmake @@ -90,6 +90,7 @@ macro(hunter_initialize) set(HUNTER_CONFIG_SHA1 "" CACHE INTERNAL "") set(HUNTER_TOOLCHAIN_SHA1 "" CACHE INTERNAL "") set(HUNTER_CACHED_CONFIGURATION_TYPES "" CACHE INTERNAL "") + set(HUNTER_CACHED_BUILD_SHARED_LIBS "" CACHE INTERNAL "") endif() else() set(HUNTER_CACHED_ROOT "${HUNTER_GATE_ROOT}" CACHE INTERNAL "") diff --git a/docs/reference/user-variables.rst b/docs/reference/user-variables.rst index 646da1ba12..211c624eee 100644 --- a/docs/reference/user-variables.rst +++ b/docs/reference/user-variables.rst @@ -78,6 +78,13 @@ HUNTER_CONFIGURATION_TYPES * See `example `__ * Default: ``Release``, ``Debug`` +HUNTER_BUILD_SHARED_LIBS +======================== + +* Value for + `BUILD_SHARED_LIBS `__ + for 3rd party packages + HUNTER_JOBS_NUMBER ================== diff --git a/scripts/create-toolchain-info.cmake b/scripts/create-toolchain-info.cmake index 50591212bf..e927acfe9d 100644 --- a/scripts/create-toolchain-info.cmake +++ b/scripts/create-toolchain-info.cmake @@ -44,6 +44,15 @@ file( " HUNTER_TOOLCHAIN_UNDETECTABLE_ID: ${HUNTER_TOOLCHAIN_UNDETECTABLE_ID}\n" ) +string(COMPARE EQUAL "${HUNTER_BUILD_SHARED_LIBS}" "" is_empty) +if(NOT is_empty) + file( + APPEND + "${TOOLCHAIN_INFO_FILE}" + " HUNTER_BUILD_SHARED_LIBS: ${HUNTER_BUILD_SHARED_LIBS}\n" + ) +endif() + string(COMPARE EQUAL "${OSX_SDK_VERSION}" "" is_empty) if(NOT is_empty) file( From 4d8be9d2d8237ed86ec92c8d097c78790a7a7ae8 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 29 Sep 2017 12:43:50 +0300 Subject: [PATCH 0031/1014] GST plugin depends on Jpeg [skip ci] --- cmake/projects/gst_plugins_good/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/gst_plugins_good/hunter.cmake b/cmake/projects/gst_plugins_good/hunter.cmake index 0269214693..90d6cd436c 100644 --- a/cmake/projects/gst_plugins_good/hunter.cmake +++ b/cmake/projects/gst_plugins_good/hunter.cmake @@ -24,7 +24,7 @@ hunter_add_version( hunter_cmake_args( gst_plugins_good CMAKE_ARGS - DEPENDS_ON_PACKAGES=gst_plugins_base;xext + DEPENDS_ON_PACKAGES=gst_plugins_base;xext;Jpeg DEPENDS_ON_PKGCONFIGS=gstreamer-plugins-base-1.0 # ??? ) From a0fd1056cde6066b3ddbb7b672a62e6f9f366bc1 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 30 Sep 2017 02:29:42 -0400 Subject: [PATCH 0032/1014] Added support for VS 2017 in libsodium msbuild scheme. --- .../libsodium/schemes/url_sha1_libsodium_msbuild.cmake.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/projects/libsodium/schemes/url_sha1_libsodium_msbuild.cmake.in b/cmake/projects/libsodium/schemes/url_sha1_libsodium_msbuild.cmake.in index 1dcf05af6b..8ed6944923 100644 --- a/cmake/projects/libsodium/schemes/url_sha1_libsodium_msbuild.cmake.in +++ b/cmake/projects/libsodium/schemes/url_sha1_libsodium_msbuild.cmake.in @@ -35,6 +35,7 @@ string(COMPARE EQUAL "@HUNTER_MSVC_VERSION@" "10" _is_platform_toolset_v100) # V string(COMPARE EQUAL "@HUNTER_MSVC_VERSION@" "11" _is_platform_toolset_v110) # VC2012 string(COMPARE EQUAL "@HUNTER_MSVC_VERSION@" "12" _is_platform_toolset_v120) # VC2013 string(COMPARE EQUAL "@HUNTER_MSVC_VERSION@" "14" _is_platform_toolset_v140) # VC2015 +string(COMPARE EQUAL "@HUNTER_MSVC_VERSION@" "15" _is_platform_toolset_v141) # VC2017 if(_is_platform_toolset_v100) set(msvc_platform_toolset "v100") @@ -44,9 +45,11 @@ elseif(_is_platform_toolset_v120) set(msvc_platform_toolset "v120") elseif(_is_platform_toolset_v140) set(msvc_platform_toolset "v140") +elseif(_is_platform_toolset_v141) + set(msvc_platform_toolset "v141") else() hunter_user_error( - "Visual studio version not supported. Supported versions are: Visual studio 2010, 2012, 2013 and 2015." + "Visual studio version not supported. Supported versions are: Visual studio 2010, 2012, 2013, 2015 and 2017." "If there is a new version please open an issue at https://github.com/ruslo/hunter and mention @Cyberunner23") endif() From 32c02ebfe8082691f78cd714bc87e79f4b94d32f Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Mon, 2 Oct 2017 12:30:33 +0300 Subject: [PATCH 0033/1014] Docs: Update 'glog' --- docs/packages/pkg/glog.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/packages/pkg/glog.rst b/docs/packages/pkg/glog.rst index 19ad635e62..f0feee0ee5 100644 --- a/docs/packages/pkg/glog.rst +++ b/docs/packages/pkg/glog.rst @@ -19,7 +19,7 @@ glog find_package(glog CONFIG REQUIRED) target_link_libraries(... glog::glog) -For Hunter <= `__FIXME__ v0.17.15 `__ +For Hunter <= `v0.17.15 `__: .. code-block:: cmake @@ -27,5 +27,8 @@ For Hunter <= `__FIXME__ v0.17.15 Date: Mon, 2 Oct 2017 12:46:58 +0300 Subject: [PATCH 0034/1014] Docs: Fix 'gflags' --- docs/packages/pkg/gflags.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/gflags.rst b/docs/packages/pkg/gflags.rst index ab3e990db9..99ab55bfe2 100644 --- a/docs/packages/pkg/gflags.rst +++ b/docs/packages/pkg/gflags.rst @@ -22,4 +22,4 @@ gflags hunter_add_package(gflags) find_package(gflags CONFIG REQUIRED) - target_link_libraries(... gflags-static) + target_link_libraries(... gflags) From b7eedeec3f313f0c1810f78f31b612ae6faeba8e Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 3 Oct 2017 20:48:25 +0300 Subject: [PATCH 0035/1014] Docs: Improve Qt --- docs/packages/pkg/Qt.rst | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/docs/packages/pkg/Qt.rst b/docs/packages/pkg/Qt.rst index cd0667efc8..505f2ed9db 100644 --- a/docs/packages/pkg/Qt.rst +++ b/docs/packages/pkg/Qt.rst @@ -139,9 +139,7 @@ Pitfalls - Conflicts with system Qt: `bug with workaround `__ -- iOS (Qt < 5.9): you must use ``qtmn`` instead of ``main`` (see - `SO `__): - +- iOS (Qt < 5.9): you must use ``qtmn`` instead of ``main``: .. code-block:: cpp @@ -155,7 +153,7 @@ Pitfalls you will see next error without this fix applied: -.. code:: +.. code-block:: none Error: You are creating QApplication before calling UIApplicationMain. If you are writing a native iOS application, and only want to use Qt for @@ -163,20 +161,27 @@ you will see next error without this fix applied: within 'applicationDidFinishLaunching' inside your UIApplication delegate. -- `QtQuick2Plugin` conflict. +.. admonition:: Stackoverflow + + * `Run-time error for Qt application on iOS built via CMake `__ + +- ``QtQuick2Plugin`` conflict. - Both `plugins/qmltooling/libqmldbg_qtquick2.a` and `qml/QtQuick.2/libqtquick2plugin.a` implement this plugin: + Both ``plugins/qmltooling/libqmldbg_qtquick2.a`` and ``qml/QtQuick.2/libqtquick2plugin.a`` implement this plugin: -.. code:: +.. code-block:: none [Install]> nm -gU plugins/qmltooling/libqmldbg_qtquick2.a | grep static_plugin 00000000000000b0 T __Z31qt_static_plugin_QtQuick2Pluginv + +.. code-block:: none + [Install]> nm -gU qml/QtQuick.2/libqtquick2plugin.a | grep static_plugin 0000000000000080 T __Z31qt_static_plugin_QtQuick2Pluginv Linking of ``libqmldbg_qtquick2.a`` may lead to the next runtime error: -.. code:: +.. code-block:: none module "QtQuick" plugin "qtquick2plugin" not found @@ -192,14 +197,14 @@ if you see this error try to remove usage of target ``Qt5::QtQuick2Plugin`` and can be fixed by installing the necessary libraries before calling CMake with the command: - .. code-block:: shell + .. code-block:: none > sudo apt-get install libfontconfig1-dev libfreetype6-dev libx11-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev - Requirements for Ubuntu for Hunter v0.14.14+ (need ``GL``,\ ``EGL``: ``/usr/include/GL/gl.h``, ``usr/include/EGL/egl.h``): - .. code-block:: shell + .. code-block:: none > sudo apt-get install libegl1-mesa-dev libgl1-mesa-dev libegl1-mesa-drivers From 43346c8df65688416e2b02b39f3b6b8b0e6a8c33 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Wed, 4 Oct 2017 12:20:31 +0300 Subject: [PATCH 0036/1014] Docs: Qt customization --- docs/packages/pkg/Qt.rst | 21 +++++++++++++++++++++ docs/packages/pkg/gstreamer.rst | 4 ++++ 2 files changed, 25 insertions(+) diff --git a/docs/packages/pkg/Qt.rst b/docs/packages/pkg/Qt.rst index 505f2ed9db..a7adfdbcfb 100644 --- a/docs/packages/pkg/Qt.rst +++ b/docs/packages/pkg/Qt.rst @@ -1,6 +1,7 @@ .. spelling:: Qt + GStreamer .. index:: ui ; Qt @@ -133,6 +134,26 @@ Examples: hunter_add_package(Qt COMPONENTS qtquickcontrols) # no *.cmake modules installed +Customization +------------- + +* ``QT_WITH_GSTREAMER`` + + * Build with :ref:`pkg.gstreamer` + * You will need this when building Qt application with camera support on Linux + * Adds ``-gstreamer 1.0`` + * Only configuration with shared libraries tested. Also you have to set + runtime paths with ``LD_LIBRARY_PATH``/``GST_PLUGIN_PATH``, see + `example `__. + * To test GStreamer camera you can run ``gst-launch -v -m camerabin`` + +* ``QT_OPENGL_DESKTOP`` + + * Use OpenGL installed on Windows + * Visual Studio + * Adds ``-opengl desktop`` + * `Qt Configure Options `__ + Pitfalls -------- diff --git a/docs/packages/pkg/gstreamer.rst b/docs/packages/pkg/gstreamer.rst index a33c542ba9..89497d21de 100644 --- a/docs/packages/pkg/gstreamer.rst +++ b/docs/packages/pkg/gstreamer.rst @@ -17,3 +17,7 @@ gstreamer hunter_add_package(gstreamer) find_package(gstreamer-1.0 CONFIG REQUIRED) target_link_libraries(... PkgConfig::gstreamer-1.0) + +.. warning:: + + * Only Linux tested From 44c6294a25bc4b0d18e314595dda8d5b145bbbca Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Wed, 4 Oct 2017 15:51:50 -0700 Subject: [PATCH 0037/1014] 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 eaff209bbfc5ae828e4163213dbaed15e5596433 Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Thu, 5 Oct 2017 09:38:19 +0200 Subject: [PATCH 0038/1014] docs: fix typo 'a priori' https://en.wikipedia.org/wiki/A_priori_and_a_posteriori --- docs/creating-new/create/cmake.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/creating-new/create/cmake.rst b/docs/creating-new/create/cmake.rst index 4249dc80cb..1dd2c597c3 100644 --- a/docs/creating-new/create/cmake.rst +++ b/docs/creating-new/create/cmake.rst @@ -381,7 +381,7 @@ Substitute ``unsorted`` with some tag in directive .. note:: - Since you don't know a priory pull request number leave it as ``N`` for now. + Since you don't know the pull request number a priori leave it as ``N`` for now. You can update it later. To check documentation building locally you can run: From 66748e18f2283feb1f1476be55ed66ad64b5a19e Mon Sep 17 00:00:00 2001 From: Reinhold Gschweicher Date: Thu, 5 Oct 2017 08:27:22 +0200 Subject: [PATCH 0039/1014] Add glbinding 2.1.3-p0 package --- cmake/configs/default.cmake | 1 + cmake/projects/glbinding/hunter.cmake | 42 +++++++++++++++++++++++++++ docs/packages/pkg/glbinding.rst | 21 ++++++++++++++ examples/glbinding/CMakeLists.txt | 36 +++++++++++++++++++++++ examples/glbinding/foo.cpp | 9 ++++++ 5 files changed, 109 insertions(+) create mode 100644 cmake/projects/glbinding/hunter.cmake create mode 100644 docs/packages/pkg/glbinding.rst create mode 100644 examples/glbinding/CMakeLists.txt create mode 100644 examples/glbinding/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 820e5d0f14..b7088cecd7 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -178,6 +178,7 @@ hunter_config(freetype VERSION 2.6.2) hunter_config(gauze VERSION 0.1.1) hunter_config(geos VERSION 3.4.2) hunter_config(gflags VERSION 2.2.1) +hunter_config(glbinding VERSION 2.1.3-p0) hunter_config(glew VERSION 2.0.0) hunter_config(glfw VERSION 3.3.0-p4) hunter_config(glib VERSION 2.54.0) diff --git a/cmake/projects/glbinding/hunter.cmake b/cmake/projects/glbinding/hunter.cmake new file mode 100644 index 0000000000..d7723edf4c --- /dev/null +++ b/cmake/projects/glbinding/hunter.cmake @@ -0,0 +1,42 @@ +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +# Load used modules +include(hunter_add_version) +include(hunter_cacheable) +include(hunter_download) +include(hunter_pick_scheme) +include(hunter_cmake_args) + +# List of versions here... + +hunter_add_version( + PACKAGE_NAME + glbinding + VERSION + "2.1.3-p0" + URL + "https://github.com/hunter-packages/glbinding/archive/v2.1.3-p0.tar.gz" + SHA1 + 7bb774ee35f63e7f769d4f4ae6194cbc3f8afe16 +) + +hunter_cmake_args( + glbinding + CMAKE_ARGS + BUILD_SHARED_LIBS=OFF + OPTION_BUILD_TESTS=OFF + OPTION_BUILD_GPU_TESTS=OFF + OPTION_BUILD_EXAMPLES=OFF + OPTION_BUILD_TOOLS=OFF + OPTION_BUILD_DOCS=OFF + HUNTER_INSTALL_LICENSE_FILES=LICENSE +) + +# Pick a download scheme +hunter_pick_scheme(DEFAULT url_sha1_cmake) # use scheme for cmake projects +hunter_cacheable(glbinding) + +# Download package. +# Two versions of library will be build by default: +hunter_download(PACKAGE_NAME glbinding) + diff --git a/docs/packages/pkg/glbinding.rst b/docs/packages/pkg/glbinding.rst new file mode 100644 index 0000000000..261c97008e --- /dev/null +++ b/docs/packages/pkg/glbinding.rst @@ -0,0 +1,21 @@ +.. spelling:: + + glbinding + +.. index:: ui ; glbinding + +.. _pkg.glbinding: + +glbinding +========= + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `NeroBurner `__ (`pr-N `__) + +.. code-block:: cmake + + hunter_add_package(glbinding) + find_package(glbinding CONFIG REQUIRED) + target_link_libraries(glbinding glbinding::glbinding) diff --git a/examples/glbinding/CMakeLists.txt b/examples/glbinding/CMakeLists.txt new file mode 100644 index 0000000000..d509905351 --- /dev/null +++ b/examples/glbinding/CMakeLists.txt @@ -0,0 +1,36 @@ +# Copyright (c) 2017, NeroBurner +# All rights reserved. + +cmake_minimum_required(VERSION 3.1) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-glbinding) + +hunter_add_package(glbinding) + +string(COMPARE EQUAL "${glbinding_LICENSES}" "" is_empty) +if(is_empty) + message(FATAL_ERROR "Licenses not found") +endif() + +message("glbinding licenses:") +foreach(x ${glbinding_LICENSES}) + message("* ${x}") + if(NOT EXISTS "${glbinding_LICENSES}") + message(FATAL_ERROR "File not found") + endif() +endforeach() + +find_package(glbinding CONFIG REQUIRED) + +# Test double library creation +find_package(glbinding CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo glbinding::glbinding) + +# glbinding needs at least this c++11 feature +target_compile_features(foo PRIVATE cxx_defaulted_move_initializers) diff --git a/examples/glbinding/foo.cpp b/examples/glbinding/foo.cpp new file mode 100644 index 0000000000..0c19b757d0 --- /dev/null +++ b/examples/glbinding/foo.cpp @@ -0,0 +1,9 @@ +#include +#include + +int main() +{ + std::cout << "Latest available gl version: " + << glbinding::Version::latest() + << std::endl; +} From 4ef7f1680fa338a3783d60dc319d9682108c10e0 Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Thu, 5 Oct 2017 10:24:38 +0200 Subject: [PATCH 0040/1014] add priori to spelling.txt --- docs/spelling.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/spelling.txt b/docs/spelling.txt index 5f8c4e257d..f587de54a7 100644 --- a/docs/spelling.txt +++ b/docs/spelling.txt @@ -42,6 +42,7 @@ performant plugin plugins prebuilt +priori reconstructible reproducibility runtime From 9886508bcefaaec898ab178684772aed3f163771 Mon Sep 17 00:00:00 2001 From: isaachier Date: Thu, 5 Oct 2017 02:32:22 -0700 Subject: [PATCH 0041/1014] Add opentracing-cpp. (#1070) --- cmake/configs/default.cmake | 1 + cmake/projects/opentracing-cpp/hunter.cmake | 20 +++++++++++++++++ docs/packages/frameworks.rst | 5 +++++ docs/packages/pkg/opentracing-cpp.rst | 25 +++++++++++++++++++++ examples/opentracing-cpp/CMakeLists.txt | 15 +++++++++++++ examples/opentracing-cpp/main.cpp | 6 +++++ 6 files changed, 72 insertions(+) create mode 100644 cmake/projects/opentracing-cpp/hunter.cmake create mode 100644 docs/packages/pkg/opentracing-cpp.rst create mode 100644 examples/opentracing-cpp/CMakeLists.txt create mode 100644 examples/opentracing-cpp/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 820e5d0f14..935f17b8d9 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -226,6 +226,7 @@ hunter_config(odb-sqlite VERSION 2.4.0) hunter_config(ogles_gpgpu VERSION 0.2.4) hunter_config(onmt VERSION 0.4.1-p2) hunter_config(openddlparser VERSION 0.1.0-p2) +hunter_config(opentracing-cpp VERSION 1.0.0) hunter_config(pciaccess VERSION 0.13.4) hunter_config(libpcre VERSION 8.41) hunter_config(poly2tri VERSION 1.0.0) diff --git a/cmake/projects/opentracing-cpp/hunter.cmake b/cmake/projects/opentracing-cpp/hunter.cmake new file mode 100644 index 0000000000..354ccffcad --- /dev/null +++ b/cmake/projects/opentracing-cpp/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 opentracing-cpp + VERSION "1.0.0" + URL "https://github.com/hunter-packages/opentracing-cpp/archive/hunter-v1.0.0.tar.gz" + SHA1 "881faab1353be98f605534d2777349eb5cbbe6be") + +hunter_cmake_args(opentracing-cpp CMAKE_ARGS + BUILD_TESTING=OFF ENABLE_LINTING=OFF) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(opentracing-cpp) +hunter_download(PACKAGE_NAME opentracing-cpp) diff --git a/docs/packages/frameworks.rst b/docs/packages/frameworks.rst index daf7ad03ec..b03721d5c2 100644 --- a/docs/packages/frameworks.rst +++ b/docs/packages/frameworks.rst @@ -1,8 +1,13 @@ +.. spelling:: + + OpenTracing + Frameworks ---------- - :ref:`pkg.Boost` - peer-reviewed portable C++ source libraries. - :ref:`pkg.BoostProcess` + - :ref:`pkg.opentracing-cpp` - OpenTracing API for C++ - :ref:`pkg.Qt` - :ref:`pkg.QtQmlManager` - :ref:`pkg.wxWidgets` - Cross-Platform GUI Library diff --git a/docs/packages/pkg/opentracing-cpp.rst b/docs/packages/pkg/opentracing-cpp.rst new file mode 100644 index 0000000000..a1d655af81 --- /dev/null +++ b/docs/packages/pkg/opentracing-cpp.rst @@ -0,0 +1,25 @@ +.. spelling:: + + opentracing + cpp + +.. index:: frameworks ; opentracing-cpp + +.. _pkg.opentracing-cpp: + +opentracing-cpp +=============== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `Isaac Hier `__ (`pr-1070 `__) + +.. code-block:: cmake + + hunter_add_package(opentracing-cpp) + find_package(OpenTracing CONFIG REQUIRED) + # Shared library + target_link_libraries(... OpenTracing::opentracing) + # Static library + target_link_libraries(... OpenTracing::opentracing-static) diff --git a/examples/opentracing-cpp/CMakeLists.txt b/examples/opentracing-cpp/CMakeLists.txt new file mode 100644 index 0000000000..d06010dce5 --- /dev/null +++ b/examples/opentracing-cpp/CMakeLists.txt @@ -0,0 +1,15 @@ +cmake_minimum_required(VERSION 3.1) + +include("../common.cmake") + +project(download-opentracing-cpp) + +set(CMAKE_CXX_STANDARD_REQUIRED true) +set(CMAKE_CXX_STANDARD 11) + +hunter_add_package(opentracing-cpp) + +find_package(OpenTracing CONFIG REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main OpenTracing::opentracing-static) diff --git a/examples/opentracing-cpp/main.cpp b/examples/opentracing-cpp/main.cpp new file mode 100644 index 0000000000..ea9e884209 --- /dev/null +++ b/examples/opentracing-cpp/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + return 0; +} From 7bf56f4842df415407cb2bbfa5d6e1be98ce4a2d Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Thu, 5 Oct 2017 11:15:20 +0200 Subject: [PATCH 0042/1014] docs: update create-new-package additional fixes: - integrate into another project - follow these guidelines - fix indentation for enumeration --- docs/creating-new/create/cmake.rst | 94 +++++++++++++++--------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/docs/creating-new/create/cmake.rst b/docs/creating-new/create/cmake.rst index 1dd2c597c3..5d7429bb23 100644 --- a/docs/creating-new/create/cmake.rst +++ b/docs/creating-new/create/cmake.rst @@ -285,10 +285,10 @@ Add this information to ``cmake/projects/hunter_box_1/hunter.cmake`` file: CMake options ============= -Note that it does not make sense to include in build such stuff like examples, -tests or documentation. Please check that your package has CMake option to -disable it and apply extra variables to all versions (if options is not -disabled by default) using ``hunter_cmake_args`` function: +Note that it does not make sense to build and install stuff like examples, +tests or documentation. Please check that your package has CMake options to +disable those. If such an option is not disabled by default use +``hunter_cmake_args``: .. code-block:: cmake :emphasize-lines: 3, 6-8 @@ -315,9 +315,9 @@ Build types .. warning:: - Usually there is no need to set build type explicitly. If package does not - work with default ``Debug`` + ``Release`` it means something wrong with - package itself. + Usually there is no need to set a build type explicitly. If the package does not + work with default ``Debug`` + ``Release`` it means something is wrong with + the package itself. Default build type(s) can be set by ``hunter_configuration_types``: @@ -343,8 +343,8 @@ Add ``hunter_config`` directive with default version to Create example ============== -Simple example will be used to test integration of package. Copy template -example and substitute all strings ``foo`` with ``hunter_box_1``: + To test the integration of the package into another project a simple example will be used. + Copy the template example and substitute all strings ``foo`` with ``hunter_box_1``: .. code-block:: none @@ -352,16 +352,16 @@ example and substitute all strings ``foo`` with ``hunter_box_1``: [hunter]> sed -i 's,foo,hunter_box_1,g' examples/hunter_box_1/* Tweak all files in ``examples/hunter_box_1`` directory to fit headers and -name of imported targets. +names of imported targets. Add documentation ================= -Each package should have +Each package should have a :doc:`page with information and usage example `. -To create such page copy template file and substitute all strings ``foo`` with -project name ``hunter_box_1`` string: +To create such a page copy the template file and substitute all strings ``foo`` with +the project name (for example ``hunter_box_1``): .. code-block:: none @@ -384,7 +384,7 @@ Substitute ``unsorted`` with some tag in directive Since you don't know the pull request number a priori leave it as ``N`` for now. You can update it later. -To check documentation building locally you can run: +To locally check if the documentation is still building you can run: .. code-block:: none @@ -395,7 +395,7 @@ To check documentation building locally you can run: Commit ====== -Now save all changes by doing commit: +Now save all changes by doing a commit: .. code-block:: none @@ -413,14 +413,14 @@ Now save all changes by doing commit: Testing locally =============== -This step is optional since we will run tests on CI server. However it's the +This step is optional since we will run tests on the CI server. However it's the fastest way to check that everything is ready and working correctly. -Script ``jenkins.py`` will package temporary Hunter archive based on current -state and build example. This script use +Script ``jenkins.py`` will package a temporary Hunter archive based on current +state and build the specified example. This script uses `Polly `__ toolchains. -Check you have Python 3 installed, clone Polly and add ``bin`` folder to +Check you have Python 3 installed, clone Polly and add its ``bin`` folder to ``PATH`` environment variable: .. code-block:: none @@ -447,11 +447,11 @@ CI testing ========== Now let's run tests on continuous integration servers with various toolchains -and platforms. Hunter use `AppVeyor `__ to test +and platforms. Hunter uses `AppVeyor `__ to test for Windows (Visual Studio, NMake, Ninja, MinGW, MSYS) and `Travis `__ to test -Linux (GCC, Clang, Android, Clang Analyzer, Sanitize Address, Sanitize Leak) -and OSX (Clang + Makefile, Xcode, iOS). +for Linux (GCC, Clang, Android, Clang Analyzer, Sanitize Address, Sanitize Leak) +and for OSX (Clang + Makefile, Xcode, iOS). Register your Hunter fork: @@ -468,12 +468,12 @@ of branches. * Repository: https://github.com/ruslo/hunter * Testing: Documentation on Linux -In branch ``master`` there is only ``.travis.yml`` file which will only check -documentation building: +In branch ``master`` there is only the ``.travis.yml`` file which will only check +if the documentation is building: * https://github.com/ruslo/hunter/blob/ea9de264d6c1b05484bdc16a9967c3cb8cca9048/.travis.yml#L57-L59 -When you open pull request to ``ruslo/hunter`` this test will run automatically. +When you open a pull request to ``ruslo/hunter`` this test will automatically run. Branch pkg.template =================== @@ -482,15 +482,14 @@ Branch pkg.template * Repository: https://github.com/ingenue/hunter * Testing: *Nothing* -In branch ``pkg.template`` of ``ingenue/hunter`` repository there are -**template** ``.travis.yml`` and ``appveyor.yml`` files: +In branch ``pkg.template`` of the repository ``ingenue/hunter`` there are +the **template** files ``.travis.yml`` and ``appveyor.yml``: * https://github.com/ingenue/hunter/blob/pkg.template/.travis.yml * https://github.com/ingenue/hunter/blob/pkg.template/appveyor.yml -All changes from ``master`` will go to ``pkg.template``. The only difference -between ``master`` and ``pkg.template`` is ``.travis.yml``/``appveyor.yml`` -files. +All changes from ``master`` will go to ``pkg.template``. The only differences +between ``master`` and ``pkg.template`` are the files ``.travis.yml``/``appveyor.yml``. Branch pkg. ================= @@ -509,8 +508,8 @@ E.g. branch ``pkg.gtest``: * Travis https://travis-ci.org/ingenue/hunter/builds/274507515 All changes from ``pkg.template`` will go to ``pkg.`` branch on updates. -The only difference between ``pkg.template`` and ``pkg.`` is -``travis.yml``/``appveyor.yml`` files. +The only differences between ``pkg.template`` and ``pkg.`` are +the files ``travis.yml``/``appveyor.yml``. Branch upload. ==================== @@ -519,9 +518,9 @@ Branch for uploads. * Name: ``upload.`` * Repository: https://github.com/ingenue/hunter -* Testing: Upload archives with binaries to server +* Testing: Upload archives with binaries to cache-server -After successful tests on ``pkg.`` branch ``upload.`` will do +After successful tests on ``pkg.`` the branch ``upload.`` will do uploads. E.g. branch ``upload.gtest``: * https://github.com/ingenue/hunter/tree/upload.gtest @@ -530,12 +529,12 @@ uploads. E.g. branch ``upload.gtest``: All changes from ``pkg.`` will go to ``upload.`` branch on updates. The only difference between ``upload.`` and ``pkg.`` is -build command: ``jenkins.py`` vs. ``jenkins.py --upload``. +the build command: ``jenkins.py`` vs. ``jenkins.py --upload``. Branches structure ================== -Here is an image for branches structure: +Here is an image showing the structure of the branches: .. image:: /creating-new/images/branches.png :align: center @@ -544,8 +543,8 @@ Here is an image for branches structure: Fetch CI configs ================ -Since we are adding new package we have to create new CI configs for it. -Fetch ``pkg.template`` branch and substitute all ``foo`` strings with +Since we are adding a new package we have to create new CI configs for it. +Fetch the branch ``pkg.template`` and substitute all ``foo`` strings with ``hunter_box_1``: .. code-block:: none @@ -564,7 +563,7 @@ Fetch ``pkg.template`` branch and substitute all ``foo`` strings with Run remote tests ================ -Current state is: +Currently we have two new branches: * ``pr.hunter_box_1`` contains new package * ``pr.pkg.hunter_box_1`` contains configs for testing @@ -600,20 +599,23 @@ Excluding tests If all tests passed you can skip this section. -If some toolchains are working and some toolchains failed it means project +If some toolchains are working and some toolchains failed it means the project has platform-specific problems. Note that you don't have to have all toolchains working and there is **no need to fix all issues you see**. If at least *something* is working then you can exclude broken -toolchain and you or somebody else can apply fixes later. +toolchains and you or somebody else can apply fixes later. -**Do not remove** toolchains from ``.travis.yml``/``appveyor.yml`` configs. -Comment it out instead to simplify enabling it back. Do not change the order -of toolchains since it will affect ``git merge``. Leave the link to broken job: +Please follow these guidelines when disabling toolchains: + +- **Do not remove** toolchains from ``.travis.yml``/``appveyor.yml`` configs. + Comment it out instead to simplify enabling it back. +- Do not change the order of toolchains since it will affect ``git merge``. +- Leave the link to broken job: .. literalinclude:: ci/.travis-NEW.yml :diff: ci/.travis-OLD.yml -If no working toolchains left for ``.travis.yml`` or ``appveyor.yml`` then +If no working toolchain is left for ``.travis.yml`` or ``appveyor.yml`` then comment out everything and add ``TOOLCHAIN=dummy`` test. Go to branch ``pr.pkg.hunter_box_1`` with CI configs and commit this change @@ -704,7 +706,7 @@ to test package: Upload ====== -After tests passed pull request will be merged and upload run. When upload +After all tests pass the pull request will be merged and upload run. When upload finished new release will be created: .. image:: /creating-new/images/upload.png From 0f5ae92a8768af57e80021b395d87a1752b682ae Mon Sep 17 00:00:00 2001 From: Reinhold Gschweicher Date: Thu, 5 Oct 2017 13:23:25 +0200 Subject: [PATCH 0043/1014] docs: pkg glbinding: update pr --- docs/packages/pkg/glbinding.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/glbinding.rst b/docs/packages/pkg/glbinding.rst index 261c97008e..cd280cafc8 100644 --- a/docs/packages/pkg/glbinding.rst +++ b/docs/packages/pkg/glbinding.rst @@ -12,7 +12,7 @@ glbinding - `Official `__ - `Hunterized `__ - `Example `__ -- Added by `NeroBurner `__ (`pr-N `__) +- Added by `NeroBurner `__ (`pr-1073 `__) .. code-block:: cmake From 770b04c48dd68194840b955a31a6f2a5887bdfca Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Thu, 5 Oct 2017 19:32:22 +0300 Subject: [PATCH 0044/1014] Boost 1.65.1 --- cmake/configs/default.cmake | 2 +- cmake/projects/Boost/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 315e58b597..5504223b46 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -44,7 +44,7 @@ if(MSVC OR MINGW) # FIXME: https://ci.appveyor.com/project/ingenue/hunter/build/1.0.2229 hunter_config(Boost VERSION 1.64.0) else() - hunter_config(Boost VERSION 1.65.0) + hunter_config(Boost VERSION 1.65.1) endif() hunter_config(BoostCompute VERSION 0.5-p0) hunter_config(BoostProcess VERSION 0.5) diff --git a/cmake/projects/Boost/hunter.cmake b/cmake/projects/Boost/hunter.cmake index 3e733723af..b206439186 100644 --- a/cmake/projects/Boost/hunter.cmake +++ b/cmake/projects/Boost/hunter.cmake @@ -15,6 +15,17 @@ set(Boost_NO_SYSTEM_PATHS ON) # use base url for official boost releases set(_hunter_boost_base_url "https://dl.bintray.com/boostorg/release") +hunter_add_version( + PACKAGE_NAME + Boost + VERSION + "1.65.1" + URL + "${_hunter_boost_base_url}/1.65.1/source/boost_1_65_1.tar.bz2" + SHA1 + 4a5b0c3c1b1b9a4d6cb6a6cc395e903e76f76720 +) + hunter_add_version( PACKAGE_NAME Boost From 9d4129220087666c4b0c1ea15328da03082190bb Mon Sep 17 00:00:00 2001 From: Reinhold Gschweicher Date: Fri, 6 Oct 2017 11:21:29 +0200 Subject: [PATCH 0045/1014] Add 'globjects' v1.1.0-p0 package --- cmake/configs/default.cmake | 1 + cmake/projects/globjects/hunter.cmake | 41 +++++++++++++++++++++++++++ docs/packages/pkg/globjects.rst | 21 ++++++++++++++ examples/globjects/CMakeLists.txt | 36 +++++++++++++++++++++++ examples/globjects/foo.cpp | 15 ++++++++++ 5 files changed, 114 insertions(+) create mode 100644 cmake/projects/globjects/hunter.cmake create mode 100644 docs/packages/pkg/globjects.rst create mode 100644 examples/globjects/CMakeLists.txt create mode 100644 examples/globjects/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 315e58b597..9b5b402a1d 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -183,6 +183,7 @@ hunter_config(glew VERSION 2.0.0) hunter_config(glfw VERSION 3.3.0-p4) hunter_config(glib VERSION 2.54.0) hunter_config(glm VERSION 0.9.8.5) +hunter_config(globjects VERSION 1.1.0-p0) hunter_config(glog VERSION 0.3.5-p1) hunter_config(glproto VERSION 1.4.17) hunter_config(gst_plugins_bad VERSION 1.10.4) diff --git a/cmake/projects/globjects/hunter.cmake b/cmake/projects/globjects/hunter.cmake new file mode 100644 index 0000000000..e925f30706 --- /dev/null +++ b/cmake/projects/globjects/hunter.cmake @@ -0,0 +1,41 @@ +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +# Load used modules +include(hunter_add_version) +include(hunter_cacheable) +include(hunter_download) +include(hunter_pick_scheme) +include(hunter_cmake_args) + +# List of versions here... + +hunter_add_version( + PACKAGE_NAME + globjects + VERSION + "1.1.0-p0" + URL + "https://github.com/hunter-packages/globjects/archive/v1.1.0-p0.tar.gz" + SHA1 + c20c8f9c384802be99b8449b447c0620c603b027 +) + +hunter_cmake_args( + globjects + CMAKE_ARGS + BUILD_SHARED_LIBS=OFF + OPTION_BUILD_TESTS=OFF + OPTION_BUILD_EXAMPLES=OFF + OPTION_BUILD_TOOLS=OFF + OPTION_BUILD_DOCS=OFF + HUNTER_INSTALL_LICENSE_FILES=LICENSE +) + +# Pick a download scheme +hunter_pick_scheme(DEFAULT url_sha1_cmake) # use scheme for cmake projects +hunter_cacheable(globjects) + +# Download package. +# Two versions of library will be build by default: +hunter_download(PACKAGE_NAME globjects) + diff --git a/docs/packages/pkg/globjects.rst b/docs/packages/pkg/globjects.rst new file mode 100644 index 0000000000..120576b92e --- /dev/null +++ b/docs/packages/pkg/globjects.rst @@ -0,0 +1,21 @@ +.. spelling:: + + globjects + +.. index:: ui ; globjects + +.. _pkg.globjects: + +globjects +========= + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `NeroBurner `__ (`pr-N `__) + +.. code-block:: cmake + + hunter_add_package(globjects) + find_package(globjects CONFIG REQUIRED) + target_link_libraries(foo globjects::globjects) diff --git a/examples/globjects/CMakeLists.txt b/examples/globjects/CMakeLists.txt new file mode 100644 index 0000000000..c3e16d7661 --- /dev/null +++ b/examples/globjects/CMakeLists.txt @@ -0,0 +1,36 @@ +# Copyright (c) 2017, NeroBurner +# All rights reserved. + +cmake_minimum_required(VERSION 3.1) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-globjects) + +hunter_add_package(globjects) + +string(COMPARE EQUAL "${globjects_LICENSES}" "" is_empty) +if(is_empty) + message(FATAL_ERROR "Licenses not found") +endif() + +message("globjects licenses:") +foreach(x ${globjects_LICENSES}) + message("* ${x}") + if(NOT EXISTS "${globjects_LICENSES}") + message(FATAL_ERROR "File not found") + endif() +endforeach() + +find_package(globjects CONFIG REQUIRED) + +# Test double library creation +find_package(globjects CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo globjects::globjects) + +# globjects needs at least this c++11 feature +target_compile_features(foo PRIVATE cxx_defaulted_move_initializers) diff --git a/examples/globjects/foo.cpp b/examples/globjects/foo.cpp new file mode 100644 index 0000000000..80fb430c0e --- /dev/null +++ b/examples/globjects/foo.cpp @@ -0,0 +1,15 @@ +#include +#include + +#include + +int main() +{ + // manage contexts + globjects::init(); + + // print version of unspecified context + std::cout << "Current gl version: " + << globjects::version() + << std::endl; +} From 95d1031b7bcf6c50c75ac2898ffd6cd29d73a89b Mon Sep 17 00:00:00 2001 From: Reinhold Gschweicher Date: Fri, 6 Oct 2017 13:02:49 +0200 Subject: [PATCH 0046/1014] docs: add PR to globjects --- docs/packages/pkg/globjects.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/globjects.rst b/docs/packages/pkg/globjects.rst index 120576b92e..71172f21d7 100644 --- a/docs/packages/pkg/globjects.rst +++ b/docs/packages/pkg/globjects.rst @@ -12,7 +12,7 @@ globjects - `Official `__ - `Hunterized `__ - `Example `__ -- Added by `NeroBurner `__ (`pr-N `__) +- Added by `NeroBurner `__ (`pr-1075 `__) .. 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 0047/1014] 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) From 5ec7b520d088387080ebe5ffa4808cbc29ee5c84 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Mon, 9 Oct 2017 15:58:12 +0300 Subject: [PATCH 0048/1014] OpenSSL MinGW: Link to crypt32.lib --- cmake/find/FindOpenSSL.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/find/FindOpenSSL.cmake b/cmake/find/FindOpenSSL.cmake index 9e0a92f2cd..31c2f671ae 100644 --- a/cmake/find/FindOpenSSL.cmake +++ b/cmake/find/FindOpenSSL.cmake @@ -363,8 +363,14 @@ if(OPENSSL_FOUND) set_target_properties(OpenSSL::Crypto PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}") find_package(Threads REQUIRED) + if(MINGW) + # https://github.com/openssl/openssl/issues/1061 + set(_openssl_mingw_crypt "crypt32") + else() + set(_openssl_mingw_crypt "") + endif() set_target_properties(OpenSSL::Crypto PROPERTIES - INTERFACE_LINK_LIBRARIES "${CMAKE_DL_LIBS};Threads::Threads") + INTERFACE_LINK_LIBRARIES "${CMAKE_DL_LIBS};Threads::Threads;${_openssl_mingw_crypt}") if(EXISTS "${OPENSSL_CRYPTO_LIBRARY}") set_target_properties(OpenSSL::Crypto PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "C" From 5d7b47497f4dee9b515371d18ad5fe921da1fb21 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Thu, 12 Oct 2017 23:46:12 +0300 Subject: [PATCH 0049/1014] libuv: Remove API 21+ requirement for Android --- cmake/projects/libuv/hunter.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmake/projects/libuv/hunter.cmake b/cmake/projects/libuv/hunter.cmake index 6d32322ee0..04eebe688d 100644 --- a/cmake/projects/libuv/hunter.cmake +++ b/cmake/projects/libuv/hunter.cmake @@ -52,10 +52,5 @@ hunter_add_version( hunter_pick_scheme(DEFAULT url_sha1_cmake) -if(ANDROID AND (CMAKE_SYSTEM_VERSION VERSION_LESS 21)) - # https://stackoverflow.com/a/32638557/2288008 - hunter_report_broken_package("API 21+ required for 'pthread_atfork'") -endif() - hunter_cacheable(libuv) hunter_download(PACKAGE_NAME libuv) From 7d4225aef852ea263217b4fda99e742f9ef6811a Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Thu, 12 Oct 2017 23:56:21 +0300 Subject: [PATCH 0050/1014] Android-ARM-EABI-v7a-System-Image 16_r04 --- cmake/configs/default.cmake | 1 + .../Android-ARM-EABI-v7a-System-Image/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index e7eb9a3236..52dfccd402 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -316,6 +316,7 @@ if(ANDROID) hunter_config(Android-Intel-x86-Atom-System-Image VERSION 16) hunter_config(Android-SDK-Platform VERSION 16_r05) hunter_config(Sources-for-Android-SDK VERSION 16) + hunter_config(Android-ARM-EABI-v7a-System-Image VERSION 16_r04) else() hunter_user_error( "Android API (CMAKE_SYSTEM_VERSION)" diff --git a/cmake/projects/Android-ARM-EABI-v7a-System-Image/hunter.cmake b/cmake/projects/Android-ARM-EABI-v7a-System-Image/hunter.cmake index a5a1b38523..4bc73a620c 100755 --- a/cmake/projects/Android-ARM-EABI-v7a-System-Image/hunter.cmake +++ b/cmake/projects/Android-ARM-EABI-v7a-System-Image/hunter.cmake @@ -9,6 +9,17 @@ include(hunter_pick_scheme) # https://dl.google.com/android/repository/sys-img/android/sys-img.xml +hunter_add_version( + PACKAGE_NAME + Android-ARM-EABI-v7a-System-Image + VERSION + "16_r04" + URL + "https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip" + SHA1 + 39c093ea755098f0ee79f607be7df9e54ba4943f +) + hunter_add_version( PACKAGE_NAME Android-ARM-EABI-v7a-System-Image From 3ba2d16df74029911ede679f015ad393e6f8d00c Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 13 Oct 2017 14:43:14 +0300 Subject: [PATCH 0051/1014] Remove trailing whitespaces --- cmake/modules/hunter_download_cache_meta_file.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/hunter_download_cache_meta_file.cmake b/cmake/modules/hunter_download_cache_meta_file.cmake index a0384915bb..fa5375cc09 100644 --- a/cmake/modules/hunter_download_cache_meta_file.cmake +++ b/cmake/modules/hunter_download_cache_meta_file.cmake @@ -75,7 +75,7 @@ function(hunter_download_cache_meta_file) url "${server}" ) - + set(local_url "${url}/master/${local_suffix}") set(done_url "${url}/master/${done_suffix}") endif() From c9f393a06a5838a6793b7e443c3dfeae291a476c Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 13 Oct 2017 15:46:54 +0300 Subject: [PATCH 0052/1014] HUNTER_CACHE_SERVERS: Full control by user --- cmake/modules/hunter_download.cmake | 2 +- cmake/modules/hunter_finalize.cmake | 8 +++-- .../faq/why-binaries-from-server-not-used.rst | 19 ++++------- docs/reference/user-variables.rst | 34 ++++++++++++++++--- .../hunter-user/nexus-cache-server.rst | 14 ++++++-- 5 files changed, 54 insertions(+), 23 deletions(-) diff --git a/cmake/modules/hunter_download.cmake b/cmake/modules/hunter_download.cmake index 5fae3cb411..beb7779945 100644 --- a/cmake/modules/hunter_download.cmake +++ b/cmake/modules/hunter_download.cmake @@ -413,7 +413,7 @@ function(hunter_download) file( APPEND "${HUNTER_DOWNLOAD_TOOLCHAIN}" - "list(APPEND HUNTER_CACHE_SERVERS ${HUNTER_CACHE_SERVERS})\n" + "set(HUNTER_CACHE_SERVERS \"${HUNTER_CACHE_SERVERS}\" CACHE INTERNAL \"\")\n" ) file( APPEND diff --git a/cmake/modules/hunter_finalize.cmake b/cmake/modules/hunter_finalize.cmake index 73d998ca7f..957ffe908f 100644 --- a/cmake/modules/hunter_finalize.cmake +++ b/cmake/modules/hunter_finalize.cmake @@ -19,8 +19,12 @@ macro(hunter_finalize) # Check preconditions hunter_sanity_checks() - list(APPEND HUNTER_CACHE_SERVERS "https://github.com/ingenue/hunter-cache") - list(REMOVE_DUPLICATES HUNTER_CACHE_SERVERS) + string(COMPARE EQUAL "${HUNTER_CACHE_SERVERS}" "" _is_empty) + if(_is_empty) + hunter_status_debug("Using default cache server") + set(HUNTER_CACHE_SERVERS "https://github.com/ingenue/hunter-cache") + endif() + hunter_status_debug("List of cache servers:") foreach(_server ${HUNTER_CACHE_SERVERS}) hunter_status_debug(" * ${_server}") diff --git a/docs/faq/why-binaries-from-server-not-used.rst b/docs/faq/why-binaries-from-server-not-used.rst index 106cdf671b..8953c61bce 100644 --- a/docs/faq/why-binaries-from-server-not-used.rst +++ b/docs/faq/why-binaries-from-server-not-used.rst @@ -181,7 +181,7 @@ Uploading to server ------------------- It is possible to upload Hunter binary cache to the server. -For now only GitHub hosting supported. All big raw ``*.tar.bz2`` archives +Next shown an example of using GitHub as a hosting. All big raw ``*.tar.bz2`` archives uploaded as assets to release with name ``cache`` (directory layout does not matter) and all small text files with meta information uploaded directly to branch ``master`` (directory layout matters) (see @@ -198,21 +198,14 @@ done using Python script ``maintenance/upload-cache-to-github.py`` (which may be called by ``jenkins.py --upload``). Note that downloading from server done by ``file(DOWNLOAD ...)`` CMake commands, so client is still CMake-only based. -Extra servers can be added by modifying variable -`HUNTER_CACHE_SERVERS `__ -before ``HunterGate`` command: - -.. code-block:: cmake - - list(APPEND HUNTER_CACHE_SERVERS "https://github.com/ingenue/hunter-cache") - HunterGate(URL ... SHA1 ...) +List of servers can be set in +:ref:`HUNTER_CACHE_SERVERS ` variable. If you want to check that there is no 3rd party builds triggered by CMake and all packages downloaded from server you can use -`HUNTER_DISABLE_BUILDS `__ -variable. Also variable -`HUNTER_USE_CACHE_SERVERS `__ -can be used to specify downloading policy. +:ref:`HUNTER_DISABLE_BUILDS ` variable. Also variable +:ref:`HUNTER_USE_CACHE_SERVERS ` can be used to specify +downloading policy. Uploading from CI servers like Travis or AppVeyor require to store password as an environment variable ``GITHUB_USER_PASSWORD`` (note that you can create diff --git a/docs/reference/user-variables.rst b/docs/reference/user-variables.rst index 211c624eee..fc0f6be041 100644 --- a/docs/reference/user-variables.rst +++ b/docs/reference/user-variables.rst @@ -101,6 +101,8 @@ HUNTER_RUN_INSTALL Set this variable to ``ON`` to run auto-install procedure if it's disabled by :ref:`HUNTER_DISABLE_AUTOINSTALL ` environment variable. +.. _hunter_disable_builds: + HUNTER_DISABLE_BUILDS ===================== @@ -109,21 +111,45 @@ HUNTER_DISABLE_BUILDS local/server cache * Default: ``NO`` +.. _hunter_cache_servers: + HUNTER_CACHE_SERVERS ==================== * Variable contains list of servers with cache binaries -* For now only GitHub supported - (see :doc:`overview `) * Variable should be modified before ``HunterGate`` command: .. code-block:: cmake - list(APPEND HUNTER_CACHE_SERVERS "https://github.com/ingenue/hunter-cache") - HunterGate(URL ... SHA1 ...) + set( + HUNTER_CACHE_SERVERS + "https://github.com/elucideye/hunter-cache" + CACHE + STRING + "Hunter cache servers" + ) + HunterGate(URL "..." SHA1 "...") + +Using two servers: + +.. code-block:: cmake + + set( + HUNTER_CACHE_SERVERS + "https://github.com/elucideye/hunter-cache;https://github.com/ingenue/hunter-cache" + CACHE + STRING + "Hunter cache servers" + ) + HunterGate(URL "..." SHA1 "...") * Default: https://github.com/ingenue/hunter-cache +.. seealso:: + + * :doc:`Why binaries from server not used? ` + * :doc:`Using Nexus Repository ` + .. _hunter_use_cache_servers: HUNTER_USE_CACHE_SERVERS diff --git a/docs/user-guides/hunter-user/nexus-cache-server.rst b/docs/user-guides/hunter-user/nexus-cache-server.rst index ac30237499..6378eb0a90 100644 --- a/docs/user-guides/hunter-user/nexus-cache-server.rst +++ b/docs/user-guides/hunter-user/nexus-cache-server.rst @@ -48,9 +48,17 @@ The simplest way to upload local cache binaries to Nexus server is by using Configuring Hunter to use Nexus =============================== -To configure ``Hunter`` to use ``Nexus`` server, you must perform the following -step: +Set :ref:`HUNTER_CACHE_SERVERS ` +variable before ``HunterGate`` to configure ``Hunter`` to use ``Nexus`` server: .. code-block:: cmake - list(APPEND HUNTER_CACHE_SERVERS "http://my.nexus.server.com/content/repositories/hunter/cache") + set( + HUNTER_CACHE_SERVERS + "http://my.nexus.server.com/content/repositories/hunter/cache" + CACHE + STRING + "Hunter cache servers" + ) + + HunterGate(URL "..." SHA1 "...") From 9d3cc2e89dfbffae6af485cc38eef3057c4354eb Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sun, 15 Oct 2017 14:46:56 +0300 Subject: [PATCH 0053/1014] Add 'OpenCV-drishti' example --- examples/OpenCV-drishti/CMakeLists.txt | 22 ++++++++++++++++++++++ examples/OpenCV-drishti/config.cmake | 10 ++++++++++ examples/OpenCV-drishti/foo.cpp | 25 +++++++++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 examples/OpenCV-drishti/CMakeLists.txt create mode 100644 examples/OpenCV-drishti/config.cmake create mode 100644 examples/OpenCV-drishti/foo.cpp diff --git a/examples/OpenCV-drishti/CMakeLists.txt b/examples/OpenCV-drishti/CMakeLists.txt new file mode 100644 index 0000000000..90e187d916 --- /dev/null +++ b/examples/OpenCV-drishti/CMakeLists.txt @@ -0,0 +1,22 @@ +# Copyright (c) 2015, Ruslan Baratov +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +set(TESTING_CONFIG_OPT FILEPATH "${CMAKE_CURRENT_LIST_DIR}/config.cmake") + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-opencv) + +hunter_add_package(OpenCV) +find_package(OpenCV REQUIRED) + +message("OpenCV_DIR: ${OpenCV_DIR}") +message("OpenCV_CONFIG: ${OpenCV_CONFIG}") +message("OpenCV_LIBS: ${OpenCV_LIBS}") + +add_executable(foo foo.cpp) +target_link_libraries(foo PRIVATE ${OpenCV_LIBS}) diff --git a/examples/OpenCV-drishti/config.cmake b/examples/OpenCV-drishti/config.cmake new file mode 100644 index 0000000000..aa5199557e --- /dev/null +++ b/examples/OpenCV-drishti/config.cmake @@ -0,0 +1,10 @@ +# https://ci.appveyor.com/project/ingenue/hunter/build/1.0.2532/job/idmsw2829ry1ltj6 +hunter_config( + OpenCV + VERSION + 3.0.0-p11 + CMAKE_ARGS + WITH_IPP=OFF + BUILD_EIGEN=OFF + WITH_EIGEN=OFF +) diff --git a/examples/OpenCV-drishti/foo.cpp b/examples/OpenCV-drishti/foo.cpp new file mode 100644 index 0000000000..593abc29de --- /dev/null +++ b/examples/OpenCV-drishti/foo.cpp @@ -0,0 +1,25 @@ +// http://docs.opencv.org/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.html + +#include +#include + +int main(int argc, char** argv) { + if (argc != 2) { + printf("usage: DisplayImage.out \n"); + return -1; + } + + cv::Mat image; + image = cv::imread(argv[1], 1); + + if (!image.data) { + printf("No image data \n"); + return EXIT_FAILURE; + } + cv::namedWindow("Display Image", cv::WINDOW_AUTOSIZE); + cv::imshow("Display Image", image); + + cv::waitKey(0); + + return EXIT_SUCCESS; +} From 676e524363ee2fe1b1c13282ff991e13af1e1776 Mon Sep 17 00:00:00 2001 From: dvirtz Date: Sun, 15 Oct 2017 17:09:54 +0300 Subject: [PATCH 0054/1014] support any 19.1x compiler --- cmake/modules/hunter_setup_msvc.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/hunter_setup_msvc.cmake b/cmake/modules/hunter_setup_msvc.cmake index cb11dac1a1..189af18606 100644 --- a/cmake/modules/hunter_setup_msvc.cmake +++ b/cmake/modules/hunter_setup_msvc.cmake @@ -42,7 +42,7 @@ macro(hunter_setup_msvc) string(COMPARE EQUAL "${MSVC_VERSION}" "1700" _vs_11_2012) string(COMPARE EQUAL "${MSVC_VERSION}" "1800" _vs_12_2013) string(COMPARE EQUAL "${MSVC_VERSION}" "1900" _vs_14_2015) - string(REGEX MATCH "^191[01]$" _vs_15_2017 "${MSVC_VERSION}") + string(REGEX MATCH "^191[0-9]$" _vs_15_2017 "${MSVC_VERSION}") if(_vs_8_2005) set(HUNTER_MSVC_VERSION "8") From f0cb100454382bc13fb0fae4a1b8a1ebb63a5179 Mon Sep 17 00:00:00 2001 From: isaachier Date: Mon, 16 Oct 2017 13:40:26 -0400 Subject: [PATCH 0055/1014] Thrift 0.9.2 (#1082) --- cmake/projects/thrift/hunter.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake/projects/thrift/hunter.cmake b/cmake/projects/thrift/hunter.cmake index 1a274e42c4..c6b593e64c 100644 --- a/cmake/projects/thrift/hunter.cmake +++ b/cmake/projects/thrift/hunter.cmake @@ -1,7 +1,6 @@ # !!! DO NOT PLACE HEADER GUARDS HERE !!! include(hunter_add_version) -include(hunter_cacheable) include(hunter_cmake_args) include(hunter_download) include(hunter_pick_scheme) @@ -12,6 +11,12 @@ hunter_add_version( URL "https://github.com/hunter-packages/thrift/archive/v0.10.0-p0.tar.gz" SHA1 "e346fd04d2228e4d08df363b4f260d92d12e7b67") +hunter_add_version( + PACKAGE_NAME thrift + VERSION "0.9.2" + URL "https://github.com/hunter-packages/thrift/archive/v0.9.2-p0.tar.gz" + SHA1 "a53f54ca03e4535b45f74bb71b07f82e0dda6640") + hunter_cmake_args(thrift CMAKE_ARGS BUILD_TESTING=OFF BUILD_TUTORIALS=OFF @@ -24,5 +29,5 @@ hunter_cmake_args(thrift CMAKE_ARGS WITH_PLUGIN=OFF) hunter_pick_scheme(DEFAULT url_sha1_cmake) -hunter_cacheable(thrift) +# Not cachable due to dependency on bison hunter_download(PACKAGE_NAME thrift) From 5d92efd38ba1dd7e97688a8e48381338223b21c9 Mon Sep 17 00:00:00 2001 From: shekharhimanshu Date: Tue, 17 Oct 2017 11:29:57 +0900 Subject: [PATCH 0056/1014] Bump PocoCpp to 1.7.9 --- cmake/configs/default.cmake | 2 +- cmake/projects/PocoCpp/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 52dfccd402..3d8a5dd128 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -102,7 +102,7 @@ else() hunter_config(OpenSSL VERSION 1.1.0f) endif() hunter_config(PNG VERSION 1.6.26-p1) -hunter_config(PocoCpp VERSION 1.7.8-p0) +hunter_config(PocoCpp VERSION 1.7.9-p0) hunter_config(PostgreSQL VERSION 9.6.3) hunter_config(Protobuf VERSION 3.0.0-p1) diff --git a/cmake/projects/PocoCpp/hunter.cmake b/cmake/projects/PocoCpp/hunter.cmake index e847256476..c394472b69 100644 --- 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.7.9-p0 + URL + "https://github.com/hunter-packages/poco/archive/v1.7.9-p0.zip" + SHA1 + 1ad6193edd0dbd67c351af7458b464252baf5bb3 +) + hunter_add_version( PACKAGE_NAME PocoCpp From 034317428f3bfb848d8feaeee656d2584d2fda2f Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 17 Oct 2017 13:40:41 +0300 Subject: [PATCH 0057/1014] OpenCV local iOS upload: ios-nocodesign-9-3-wo-armv7s toolchain [skip ci] --- .../opencv/run-ios-nocodesign-9-3-wo-armv7s.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 maintenance/local-upload/opencv/run-ios-nocodesign-9-3-wo-armv7s.sh diff --git a/maintenance/local-upload/opencv/run-ios-nocodesign-9-3-wo-armv7s.sh b/maintenance/local-upload/opencv/run-ios-nocodesign-9-3-wo-armv7s.sh new file mode 100755 index 0000000000..f5b57d18f3 --- /dev/null +++ b/maintenance/local-upload/opencv/run-ios-nocodesign-9-3-wo-armv7s.sh @@ -0,0 +1,16 @@ +#!/bin/bash -e + +set -x + +[ "${GITHUB_USER_PASSWORD}" = "" ] && { echo "GITHUB_USER_PASSWORD is not set"; exit 1; } + +export GITHUB_USER_PASSWORD + +THIS_SCRIPT_DIR=`dirname "${BASH_SOURCE[0]}"` + +cd "${THIS_SCRIPT_DIR}/../../.." + +# { +export TOOLCHAIN=ios-nocodesign-9-3-wo-armv7s +PROJECT_DIR=examples/OpenCV ./jenkins.py --clear-except-download --upload +# } From 5dfe5ceb3b858a7f61e18ac61d46e2a4f5fb953f Mon Sep 17 00:00:00 2001 From: isaachier Date: Wed, 18 Oct 2017 15:24:04 -0400 Subject: [PATCH 0058/1014] Update Libevent (#1086) --- cmake/configs/default.cmake | 2 +- cmake/projects/Libevent/hunter.cmake | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 3d8a5dd128..3782980605 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -82,7 +82,7 @@ hunter_config(Leathers VERSION 0.1.6) hunter_config(Leptonica VERSION 1.74.2-p4) hunter_config(Libcxx VERSION 3.6.2) # Clang hunter_config(Libcxxabi VERSION 3.6.2) # Clang -hunter_config(Libevent VERSION 2.1.8) +hunter_config(Libevent VERSION 2.1.8-p3) hunter_config(libffi VERSION 3.2.1) hunter_config(librtmp VERSION 2.4.0-p0) hunter_config(Libssh2 VERSION 1.7.0) diff --git a/cmake/projects/Libevent/hunter.cmake b/cmake/projects/Libevent/hunter.cmake index 83bddb7a1c..f3ad22934b 100644 --- a/cmake/projects/Libevent/hunter.cmake +++ b/cmake/projects/Libevent/hunter.cmake @@ -11,6 +11,13 @@ hunter_add_version( VERSION "2.1.8" URL "https://github.com/hunter-packages/libevent/archive/v2.1.8-p2.tar.gz" SHA1 "492abb962dad3071f34bbe4975e28768fd29edf0") + +hunter_add_version( + PACKAGE_NAME Libevent + VERSION "2.1.8-p3" + URL "https://github.com/hunter-packages/libevent/archive/v2.1.8-p3.tar.gz" + SHA1 "c6a1b1ffe52d73d9cf5c6ed2088708f8e6a093fe") + hunter_cmake_args(Libevent CMAKE_ARGS EVENT__DISABLE_TESTS=ON EVENT__DISABLE_SAMPLES=ON From ce2637526f3ad3d1e6f1cd64e02bd002ea6d0e21 Mon Sep 17 00:00:00 2001 From: isaachier Date: Thu, 19 Oct 2017 11:47:04 -0400 Subject: [PATCH 0059/1014] Add c-ares package (#1087) --- cmake/configs/default.cmake | 1 + cmake/projects/c-ares/hunter.cmake | 16 ++++++++++++++++ docs/packages/networking.rst | 2 ++ docs/packages/pkg/c-ares.rst | 20 ++++++++++++++++++++ examples/c-ares/CMakeLists.txt | 12 ++++++++++++ examples/c-ares/main.cpp | 6 ++++++ 6 files changed, 57 insertions(+) create mode 100644 cmake/projects/c-ares/hunter.cmake create mode 100644 docs/packages/pkg/c-ares.rst create mode 100644 examples/c-ares/CMakeLists.txt create mode 100644 examples/c-ares/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 3782980605..a23a42acc0 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -156,6 +156,7 @@ hunter_config(cryptopp VERSION 5.6.5) hunter_config(cvmatio VERSION 1.0.27-p3) hunter_config(cxxopts VERSION 1.0.0-p0) hunter_config(czmq VERSION 4.0.2-p1) +hunter_config(c-ares VERSION 1.13.0) hunter_config(damageproto VERSION 1.2.1) hunter_config(dbus VERSION 1.10.0-hunter-4) hunter_config(dest VERSION 0.8.0-p4) diff --git a/cmake/projects/c-ares/hunter.cmake b/cmake/projects/c-ares/hunter.cmake new file mode 100644 index 0000000000..18d5d250e6 --- /dev/null +++ b/cmake/projects/c-ares/hunter.cmake @@ -0,0 +1,16 @@ +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +include(hunter_add_version) +include(hunter_cacheable) +include(hunter_download) +include(hunter_pick_scheme) + +hunter_add_version( + PACKAGE_NAME c-ares + VERSION "1.13.0" + URL "https://github.com/c-ares/c-ares/archive/cares-1_13_0.tar.gz" + SHA1 "00a0dcb85db6f08afdaf4731cc8e3606daf5a12b") + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(c-ares) +hunter_download(PACKAGE_NAME c-ares) diff --git a/docs/packages/networking.rst b/docs/packages/networking.rst index bc6ecf8430..b14beac156 100644 --- a/docs/packages/networking.rst +++ b/docs/packages/networking.rst @@ -1,5 +1,6 @@ .. spelling:: + c-ares mDNS DNS websocket @@ -12,6 +13,7 @@ Networking - :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 + - :ref:`pkg.c-ares` - A C library for asynchronous DNS requests - :ref:`pkg.CppNetlibUri` - C++ Network URI - :ref:`pkg.CURL` - A command line tool and library for transferring data with URL syntax - :ref:`pkg.Libevent` - An event notification library for developing scalable network servers. diff --git a/docs/packages/pkg/c-ares.rst b/docs/packages/pkg/c-ares.rst new file mode 100644 index 0000000000..26e5a5a4b9 --- /dev/null +++ b/docs/packages/pkg/c-ares.rst @@ -0,0 +1,20 @@ +.. spelling:: + + c-ares + +.. index:: networking ; c-ares + +.. _pkg.c-ares: + +c-ares +====== + +- `Official `__ +- `Example `__ +- Added by `Isaac Hier `__ (`pr-1087 `__) + +.. code-block:: cmake + + hunter_add_package(c-ares) + find_package(c-ares CONFIG REQUIRED) + target_link_libraries(... c-ares::cares) diff --git a/examples/c-ares/CMakeLists.txt b/examples/c-ares/CMakeLists.txt new file mode 100644 index 0000000000..b45e2b4f89 --- /dev/null +++ b/examples/c-ares/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.1) + +include("../common.cmake") + +project(download-c-ares) + +hunter_add_package(c-ares) + +find_package(c-ares CONFIG REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main c-ares::cares) diff --git a/examples/c-ares/main.cpp b/examples/c-ares/main.cpp new file mode 100644 index 0000000000..0279bc42cd --- /dev/null +++ b/examples/c-ares/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + return 0; +} From def62a7421eabc87f0e65a6aaf0fa08b35a901a9 Mon Sep 17 00:00:00 2001 From: isaachier Date: Fri, 20 Oct 2017 05:14:38 -0400 Subject: [PATCH 0060/1014] Update Thrift to fix Threads package (#1090) --- cmake/configs/default.cmake | 2 +- cmake/projects/thrift/hunter.cmake | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index a23a42acc0..9658868393 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -254,7 +254,7 @@ endif() hunter_config(szip VERSION 2.1.0-p1) hunter_config(Tesseract VERSION 3.05.01-hunter-3) hunter_config(thread-pool-cpp VERSION 1.1.0) -hunter_config(thrift VERSION 0.10.0) +hunter_config(thrift VERSION 0.10.0-p1) hunter_config(tinydir VERSION 1.2-p0) hunter_config(util_linux VERSION 2.30.1) hunter_config(websocketpp VERSION 0.7.0-p2) diff --git a/cmake/projects/thrift/hunter.cmake b/cmake/projects/thrift/hunter.cmake index c6b593e64c..89b1bdd676 100644 --- a/cmake/projects/thrift/hunter.cmake +++ b/cmake/projects/thrift/hunter.cmake @@ -11,12 +11,24 @@ hunter_add_version( URL "https://github.com/hunter-packages/thrift/archive/v0.10.0-p0.tar.gz" SHA1 "e346fd04d2228e4d08df363b4f260d92d12e7b67") +hunter_add_version( + PACKAGE_NAME thrift + VERSION "0.10.0-p1" + URL "https://github.com/hunter-packages/thrift/archive/v0.10.0-p1.tar.gz" + SHA1 "7ac349820b9abe5d613f32474e4e1efb41d2b536") + hunter_add_version( PACKAGE_NAME thrift VERSION "0.9.2" URL "https://github.com/hunter-packages/thrift/archive/v0.9.2-p0.tar.gz" SHA1 "a53f54ca03e4535b45f74bb71b07f82e0dda6640") +hunter_add_version( + PACKAGE_NAME thrift + VERSION "0.9.2-p1" + URL "https://github.com/hunter-packages/thrift/archive/v0.9.2-p1.tar.gz" + SHA1 "b097d5df29681d57c2b75ecfc4400b5ab28252ba") + hunter_cmake_args(thrift CMAKE_ARGS BUILD_TESTING=OFF BUILD_TUTORIALS=OFF From cc058cc019542265923c7115389ec10ce3c86e8a Mon Sep 17 00:00:00 2001 From: isaachier Date: Fri, 20 Oct 2017 05:17:57 -0400 Subject: [PATCH 0061/1014] Add benchmark package (#1088) --- cmake/configs/default.cmake | 1 + cmake/projects/benchmark/hunter.cmake | 19 +++++++++++++++++++ docs/packages/pkg/benchmark.rst | 20 ++++++++++++++++++++ docs/packages/testing.rst | 5 +++++ examples/benchmark/CMakeLists.txt | 12 ++++++++++++ examples/benchmark/main.cpp | 6 ++++++ 6 files changed, 63 insertions(+) create mode 100644 cmake/projects/benchmark/hunter.cmake create mode 100644 docs/packages/pkg/benchmark.rst create mode 100644 examples/benchmark/CMakeLists.txt create mode 100644 examples/benchmark/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 9658868393..a04bf0cc79 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -143,6 +143,7 @@ hunter_config(Catch VERSION 1.8.2-p0) hunter_config(aes VERSION 0.0.1-p1) hunter_config(aglet VERSION 1.2.0) hunter_config(autobahn-cpp VERSION 0.2.0) +hunter_config(benchmark VERSION 1.2.0) hunter_config(bison VERSION 3.0.4) hunter_config(boost-pba VERSION 1.0.0-p0) hunter_config(ccv VERSION 0.7-p6) diff --git a/cmake/projects/benchmark/hunter.cmake b/cmake/projects/benchmark/hunter.cmake new file mode 100644 index 0000000000..73870bd733 --- /dev/null +++ b/cmake/projects/benchmark/hunter.cmake @@ -0,0 +1,19 @@ +# !!! 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 benchmark + VERSION "1.2.0" + URL "https://github.com/google/benchmark/archive/v1.2.0.tar.gz" + SHA1 "5f26619848c59ddc354e2d51e2f196d2a6ddb189") + +hunter_cmake_args(benchmark CMAKE_ARGS BENCHMARK_ENABLE_TESTING=OFF) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(benchmark) +hunter_download(PACKAGE_NAME benchmark) diff --git a/docs/packages/pkg/benchmark.rst b/docs/packages/pkg/benchmark.rst new file mode 100644 index 0000000000..9954f9fe1b --- /dev/null +++ b/docs/packages/pkg/benchmark.rst @@ -0,0 +1,20 @@ +.. spelling:: + + benchmark + +.. index:: serialization ; benchmark + +.. _pkg.benchmark: + +benchmark +========= + +- `Official `__ +- `Example `__ +- Added by `Isaac Hier `__ (`pr-1088 `__) + +.. code-block:: cmake + + hunter_add_package(benchmark) + find_package(benchmark CONFIG REQUIRED) + target_link_libraries(... benchmark::benchmark) diff --git a/docs/packages/testing.rst b/docs/packages/testing.rst index 63513d9ea2..bddab0b3a3 100644 --- a/docs/packages/testing.rst +++ b/docs/packages/testing.rst @@ -1,6 +1,11 @@ +.. spelling:: + + benchmarking + Testing ------- + - :ref:`pkg.benchmark` - A library to support the benchmarking of functions, similar to unit-tests - :ref:`pkg.Catch` - A modern, C++-native, header-only, framework for unit-tests, TDD and BDD C++ Automated Test Cases in Headers - :ref:`pkg.crashpad` - crash-reporting system. - :ref:`pkg.FakeIt` - C++ mocking made easy. A simple yet very expressive, header-only library for C++ mocking. diff --git a/examples/benchmark/CMakeLists.txt b/examples/benchmark/CMakeLists.txt new file mode 100644 index 0000000000..eb071db2d5 --- /dev/null +++ b/examples/benchmark/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.1) + +include("../common.cmake") + +project(download-benchmark) + +hunter_add_package(benchmark) + +find_package(benchmark CONFIG REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main benchmark::benchmark) diff --git a/examples/benchmark/main.cpp b/examples/benchmark/main.cpp new file mode 100644 index 0000000000..e2455fe16d --- /dev/null +++ b/examples/benchmark/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + return 0; +} From e5680594c8243f5708430c815fc6cf12f9de0c09 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 20 Oct 2017 01:28:00 +0300 Subject: [PATCH 0062/1014] gauze 0.1.2 --- cmake/configs/default.cmake | 2 +- cmake/projects/gauze/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index a04bf0cc79..e11e25f879 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -177,7 +177,7 @@ hunter_config(flatbuffers VERSION 1.3.0-p3) hunter_config(flex VERSION 2.6.4) hunter_config(fmt VERSION 4.0.0) hunter_config(freetype VERSION 2.6.2) -hunter_config(gauze VERSION 0.1.1) +hunter_config(gauze VERSION 0.1.2) hunter_config(geos VERSION 3.4.2) hunter_config(gflags VERSION 2.2.1) hunter_config(glbinding VERSION 2.1.3-p0) diff --git a/cmake/projects/gauze/hunter.cmake b/cmake/projects/gauze/hunter.cmake index 55838e6801..4a48dfea12 100644 --- a/cmake/projects/gauze/hunter.cmake +++ b/cmake/projects/gauze/hunter.cmake @@ -31,6 +31,17 @@ hunter_add_version( 4993b09855e51047ea51136a05fcd6d0216f2716 ) +hunter_add_version( + PACKAGE_NAME + gauze + VERSION + 0.1.2 + URL + "https://github.com/hunter-packages/gauze/archive/v0.1.2.tar.gz" + SHA1 + 43e56210b7f42bd83bb15a91acb1f940037da329 +) + hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(gauze) hunter_cmake_args(gauze CMAKE_ARGS GAUZE_BUILD_TESTS=OFF) From e27d386007418bc4ade692cf7fe759e5869a0738 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Fri, 20 Oct 2017 09:44:22 -0400 Subject: [PATCH 0063/1014] fix github sha1 for 0.1.6-p5 --- cmake/projects/GPUImage/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/GPUImage/hunter.cmake b/cmake/projects/GPUImage/hunter.cmake index c7ab681ae6..e1a9f4544f 100644 --- a/cmake/projects/GPUImage/hunter.cmake +++ b/cmake/projects/GPUImage/hunter.cmake @@ -17,7 +17,7 @@ hunter_add_version( URL "https://github.com/hunter-packages/GPUImage/archive/v0.1.6-p5.tar.gz" SHA1 - 463564d96442c214d21faa28a3ca229962ca086c + 69a287016c57ca02012faf973e2eabda4ec87123 ) hunter_add_version( From a669715642f2a5743c0ca0bb8e90dbbccb5c8b7a Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 21 Oct 2017 00:12:19 +0300 Subject: [PATCH 0064/1014] OpenCV local upload iOS 11.0 [skip ci] --- ...0-arm64-dep-9-0-device-libcxx-hid-sections.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 maintenance/local-upload/opencv/run-ios-nocodesign-11-0-arm64-dep-9-0-device-libcxx-hid-sections.sh diff --git a/maintenance/local-upload/opencv/run-ios-nocodesign-11-0-arm64-dep-9-0-device-libcxx-hid-sections.sh b/maintenance/local-upload/opencv/run-ios-nocodesign-11-0-arm64-dep-9-0-device-libcxx-hid-sections.sh new file mode 100755 index 0000000000..5581e3007b --- /dev/null +++ b/maintenance/local-upload/opencv/run-ios-nocodesign-11-0-arm64-dep-9-0-device-libcxx-hid-sections.sh @@ -0,0 +1,16 @@ +#!/bin/bash -e + +set -x + +[ "${GITHUB_USER_PASSWORD}" = "" ] && { echo "GITHUB_USER_PASSWORD is not set"; exit 1; } + +export GITHUB_USER_PASSWORD + +THIS_SCRIPT_DIR=`dirname "${BASH_SOURCE[0]}"` + +cd "${THIS_SCRIPT_DIR}/../../.." + +# { +export TOOLCHAIN=ios-nocodesign-11-0-arm64-dep-9-0-device-libcxx-hid-sections +PROJECT_DIR=examples/OpenCV ./jenkins.py --clear-except-download --upload +# } From fa9578cc8454da36566e3d978f2445870d09e624 Mon Sep 17 00:00:00 2001 From: isaachier Date: Fri, 20 Oct 2017 17:37:09 -0400 Subject: [PATCH 0065/1014] Update Protobuf (#1096) --- cmake/configs/default.cmake | 2 +- cmake/projects/Protobuf/hunter.cmake | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index e11e25f879..f8bb7c905c 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -104,7 +104,7 @@ endif() hunter_config(PNG VERSION 1.6.26-p1) hunter_config(PocoCpp VERSION 1.7.9-p0) hunter_config(PostgreSQL VERSION 9.6.3) -hunter_config(Protobuf VERSION 3.0.0-p1) +hunter_config(Protobuf VERSION 3.3.0) string(COMPARE EQUAL "${CMAKE_SYSTEM_NAME}" "Linux" _is_linux) if(_is_linux OR MINGW) diff --git a/cmake/projects/Protobuf/hunter.cmake b/cmake/projects/Protobuf/hunter.cmake index fbe0b76edf..a23dc14799 100644 --- a/cmake/projects/Protobuf/hunter.cmake +++ b/cmake/projects/Protobuf/hunter.cmake @@ -50,6 +50,28 @@ hunter_add_version( f91766a391284b7ccd192fa36bc3f09449b3c202 ) +hunter_add_version( + PACKAGE_NAME + Protobuf + VERSION + "3.1.0" + URL + "https://github.com/hunter-packages/protobuf/archive/v3.1.0-hunter-4.tar.gz" + SHA1 + 8f58f2cbe6d3fae61451a5e29b703686fe4bc9d6 +) + +hunter_add_version( + PACKAGE_NAME + Protobuf + VERSION + "3.3.0" + URL + "https://github.com/hunter-packages/protobuf/archive/v3.3.0-hunter-1.tar.gz" + SHA1 + 8815a6be8188b2d6c8002924e752018b64658748 +) + if(ANDROID OR IOS) hunter_cmake_args( Protobuf From 5db38177bb59b7a6c20d4006126d5e87a55cf033 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Fri, 20 Oct 2017 18:57:16 -0400 Subject: [PATCH 0066/1014] add ogles_gpgpu v0.2.5 (#1093) --- cmake/configs/default.cmake | 2 +- cmake/projects/ogles_gpgpu/hunter.cmake | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index f8bb7c905c..d9bdb18fa0 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -228,7 +228,7 @@ hunter_config(odb-compiler VERSION 2.4.0) hunter_config(odb-mysql VERSION 2.4.0) hunter_config(odb-pgsql VERSION 2.4.0) hunter_config(odb-sqlite VERSION 2.4.0) -hunter_config(ogles_gpgpu VERSION 0.2.4) +hunter_config(ogles_gpgpu VERSION 0.2.5) hunter_config(onmt VERSION 0.4.1-p2) hunter_config(openddlparser VERSION 0.1.0-p2) hunter_config(opentracing-cpp VERSION 1.0.0) diff --git a/cmake/projects/ogles_gpgpu/hunter.cmake b/cmake/projects/ogles_gpgpu/hunter.cmake index 93b2441e0c..b8c831bead 100644 --- a/cmake/projects/ogles_gpgpu/hunter.cmake +++ b/cmake/projects/ogles_gpgpu/hunter.cmake @@ -117,7 +117,18 @@ hunter_add_version( "https://github.com/hunter-packages/ogles_gpgpu/archive/v0.2.4.tar.gz" SHA1 ce38c35533fbb8f8efc30eb74d300598ee2132aa -) + ) + +hunter_add_version( + PACKAGE_NAME + ogles_gpgpu + VERSION + 0.2.5 + URL + "https://github.com/hunter-packages/ogles_gpgpu/archive/v0.2.5.tar.gz" + SHA1 + d6b3f57470effbfe6b89678144272f22923597db + ) hunter_cmake_args(ogles_gpgpu CMAKE_ARGS OGLES_GPGPU_INSTALL=ON) hunter_pick_scheme(DEFAULT url_sha1_cmake) From d01abf1049df782880554d55592c16482737dfe0 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 13 Oct 2017 02:20:01 +0300 Subject: [PATCH 0067/1014] Add 'Drishti' package --- cmake/configs/default.cmake | 1 + cmake/projects/drishti/hunter.cmake | 27 +++++++++++++++++++++++++++ docs/packages/computer-vision.rst | 1 + docs/packages/pkg/drishti.rst | 19 +++++++++++++++++++ examples/drishti/CMakeLists.txt | 18 ++++++++++++++++++ examples/drishti/config.cmake | 5 +++++ examples/drishti/foo.cpp | 6 ++++++ 7 files changed, 77 insertions(+) create mode 100644 cmake/projects/drishti/hunter.cmake create mode 100644 docs/packages/pkg/drishti.rst create mode 100644 examples/drishti/CMakeLists.txt create mode 100644 examples/drishti/config.cmake create mode 100644 examples/drishti/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index d9bdb18fa0..db77db6207 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -166,6 +166,7 @@ hunter_config(doctest VERSION 1.2.0) hunter_config(double-conversion VERSION 3.0.0) hunter_config(dri2proto VERSION 2.8) hunter_config(dri3proto VERSION 1.0) +hunter_config(drishti VERSION 0.8.4) hunter_config(drishti_assets VERSION 1.8) hunter_config(drishti_faces VERSION 1.2) hunter_config(drm VERSION 2.4.67) diff --git a/cmake/projects/drishti/hunter.cmake b/cmake/projects/drishti/hunter.cmake new file mode 100644 index 0000000000..f657740459 --- /dev/null +++ b/cmake/projects/drishti/hunter.cmake @@ -0,0 +1,27 @@ +# Copyright (c) 2016-2017, 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 + drishti + VERSION + 0.8.4 + URL + "https://github.com/elucideye/drishti/archive/v0.8.4.tar.gz" + SHA1 + 8d3bdc346073c0a1449b213fe374f6baf7589af1 +) + +hunter_cmake_args(drishti CMAKE_ARGS DRISHTI_BUILD_EXAMPLES=NO) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(drishti) +hunter_download(PACKAGE_NAME drishti) diff --git a/docs/packages/computer-vision.rst b/docs/packages/computer-vision.rst index 52b1038f83..909e4dfb2f 100644 --- a/docs/packages/computer-vision.rst +++ b/docs/packages/computer-vision.rst @@ -11,6 +11,7 @@ Computer Vision - :ref:`pkg.cvmatio` - Matlab Mat file read and write C++ class with OpenCV bindings. - :ref:`pkg.dest` - high performance 2D shape tracking leveraging machine learning methods. - :ref:`pkg.dlib` - modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ to solve real world problems. + - :ref:`pkg.drishti` - Real time eye tracking for embedded and mobile devices. - :ref:`pkg.eos` - A lightweight 3D Morphable Face Model fitting library in modern C++11/14 - :ref:`pkg.OpenCV` - Open Source Computer Vision Library - :ref:`pkg.xgboost` - Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM>`_ Library diff --git a/docs/packages/pkg/drishti.rst b/docs/packages/pkg/drishti.rst new file mode 100644 index 0000000000..4d5294e7f8 --- /dev/null +++ b/docs/packages/pkg/drishti.rst @@ -0,0 +1,19 @@ +.. spelling:: + + drishti + +.. index:: computer-vision ; drishti + +.. _pkg.drishti: + +drishti +======= + +- `Official `__ +- `Example `__ + +.. code-block:: cmake + + hunter_add_package(drishti) + find_package(drishti CONFIG REQUIRED) + target_link_libraries(... drishti::drishti) diff --git a/examples/drishti/CMakeLists.txt b/examples/drishti/CMakeLists.txt new file mode 100644 index 0000000000..97efa39c59 --- /dev/null +++ b/examples/drishti/CMakeLists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +set(TESTING_CONFIG_OPT FILEPATH "${CMAKE_CURRENT_LIST_DIR}/config.cmake") + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-drishti) + +hunter_add_package(drishti) +find_package(drishti CONFIG REQUIRED) + +add_executable(drishti foo.cpp) +target_link_libraries(drishti drishti::drishti) diff --git a/examples/drishti/config.cmake b/examples/drishti/config.cmake new file mode 100644 index 0000000000..462362be0e --- /dev/null +++ b/examples/drishti/config.cmake @@ -0,0 +1,5 @@ +hunter_config( + xgboost + VERSION ${HUNTER_xgboost_VERSION} + CMAKE_ARGS XGBOOST_USE_HALF=ON XGBOOST_USE_CEREAL=ON XGBOOST_DO_LEAN=ON +) diff --git a/examples/drishti/foo.cpp b/examples/drishti/foo.cpp new file mode 100644 index 0000000000..9274d5cec8 --- /dev/null +++ b/examples/drishti/foo.cpp @@ -0,0 +1,6 @@ +#include + +int main() { + std::string sModel; + drishti::sdk::EyeSegmenter segmenter(sModel); +} From 08d25c51e8fa3f3fcfa73f655fe3a7d85d1b4109 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 14 Oct 2017 16:32:35 +0300 Subject: [PATCH 0068/1014] Drishti example: Tweak 'dlib' version --- examples/drishti/config.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/drishti/config.cmake b/examples/drishti/config.cmake index 462362be0e..2464c0810f 100644 --- a/examples/drishti/config.cmake +++ b/examples/drishti/config.cmake @@ -3,3 +3,8 @@ hunter_config( VERSION ${HUNTER_xgboost_VERSION} CMAKE_ARGS XGBOOST_USE_HALF=ON XGBOOST_USE_CEREAL=ON XGBOOST_DO_LEAN=ON ) + +if(ANDROID) + # https://travis-ci.org/ingenue/hunter/jobs/287844545 + hunter_config(dlib VERSION 19.2-p1) +endif() From 273523aec9fa2d94c655a7953eec2be79c59938a Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 14 Oct 2017 17:53:42 +0300 Subject: [PATCH 0069/1014] Drishti example: Fix MSVC --- examples/drishti/config.cmake | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/examples/drishti/config.cmake b/examples/drishti/config.cmake index 2464c0810f..915a369367 100644 --- a/examples/drishti/config.cmake +++ b/examples/drishti/config.cmake @@ -8,3 +8,16 @@ if(ANDROID) # https://travis-ci.org/ingenue/hunter/jobs/287844545 hunter_config(dlib VERSION 19.2-p1) endif() + +if(MSVC) + # https://ci.appveyor.com/project/ingenue/hunter/build/1.0.2532/job/idmsw2829ry1ltj6 + hunter_config( + OpenCV + VERSION + 3.0.0-p11 + CMAKE_ARGS + WITH_IPP=OFF + BUILD_EIGEN=OFF + WITH_EIGEN=OFF + ) +endif() From 0176a3bd82ce8757b1735e6935fb7ad00f9ba578 Mon Sep 17 00:00:00 2001 From: Sacha Date: Sun, 22 Oct 2017 06:13:55 +1000 Subject: [PATCH 0070/1014] dlib: Fix Windows cross-compile --- cmake/configs/default.cmake | 2 +- cmake/projects/dlib/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index db77db6207..7fc9262ab0 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -161,7 +161,7 @@ hunter_config(c-ares VERSION 1.13.0) hunter_config(damageproto VERSION 1.2.1) hunter_config(dbus VERSION 1.10.0-hunter-4) hunter_config(dest VERSION 0.8.0-p4) -hunter_config(dlib VERSION 19.6-p0) +hunter_config(dlib VERSION 19.6-p1) hunter_config(doctest VERSION 1.2.0) hunter_config(double-conversion VERSION 3.0.0) hunter_config(dri2proto VERSION 2.8) diff --git a/cmake/projects/dlib/hunter.cmake b/cmake/projects/dlib/hunter.cmake index 518cdc9d0b..0bdf764d1a 100644 --- a/cmake/projects/dlib/hunter.cmake +++ b/cmake/projects/dlib/hunter.cmake @@ -9,6 +9,17 @@ include(hunter_cmake_args) include(hunter_download) include(hunter_pick_scheme) +hunter_add_version( + PACKAGE_NAME + dlib + VERSION + "19.6-p1" + URL + "https://github.com/hunter-packages/dlib/archive/v19.6-p1.tar.gz" + SHA1 + 1f514ffabb5aced4248f40e22db701f0356dcb0f +) + hunter_add_version( PACKAGE_NAME dlib From 5ec637c0ebb0c8a4193f1aeee5da120a2bbe22b0 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sun, 22 Oct 2017 18:08:24 +0300 Subject: [PATCH 0071/1014] jenkins.py: Use '--discard' on upload stage too [skip ci] --- jenkins.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jenkins.py b/jenkins.py index 06f87f0326..d6c6b776cb 100755 --- a/jenkins.py +++ b/jenkins.py @@ -255,6 +255,9 @@ def run(): 'TESTING_URL={}'.format(hunter_url), 'TESTING_SHA1={}'.format(hunter_sha1) ] + if not verbose: + args += ['--discard', '10'] + args += ['--tail', '200'] print('Execute command: [') for i in args: From 8a5ba88b08b090cb8f98f7d630331f7559f30b34 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Sun, 22 Oct 2017 12:29:54 -0400 Subject: [PATCH 0072/1014] update eigne3-nnls Fix `_P` namespace conflict for android/gcc. --- cmake/configs/default.cmake | 2 +- cmake/projects/eigen3-nnls/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 7fc9262ab0..5049a3fbe3 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -170,7 +170,7 @@ hunter_config(drishti VERSION 0.8.4) hunter_config(drishti_assets VERSION 1.8) hunter_config(drishti_faces VERSION 1.2) hunter_config(drm VERSION 2.4.67) -hunter_config(eigen3-nnls VERSION 1.0.0) +hunter_config(eigen3-nnls VERSION 1.0.1) hunter_config(eos VERSION 0.12.1) hunter_config(FakeIt VERSION 2.0.3) hunter_config(fixesproto VERSION 5.0) diff --git a/cmake/projects/eigen3-nnls/hunter.cmake b/cmake/projects/eigen3-nnls/hunter.cmake index 013364a0b6..09e9a44a37 100644 --- a/cmake/projects/eigen3-nnls/hunter.cmake +++ b/cmake/projects/eigen3-nnls/hunter.cmake @@ -21,6 +21,17 @@ hunter_add_version( 0bc34af72ace36e14dc8387e292e338ee30f620d ) +hunter_add_version( + PACKAGE_NAME + eigen3-nnls + VERSION + 1.0.1 + URL + "https://github.com/hunter-packages/eigen3-nnls/archive/v1.0.1.tar.gz" + SHA1 + c324595a32b51476eb5e26ce70616709e97b2ec3 + ) + hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(eigen3-nnls) hunter_download(PACKAGE_NAME eigen3-nnls) From f8f71aa502f0033b6582191db8567fe9b6fd4925 Mon Sep 17 00:00:00 2001 From: Tom Mason Date: Sun, 3 Sep 2017 19:05:26 +0200 Subject: [PATCH 0073/1014] some small fixes for SDL package --- cmake/configs/default.cmake | 2 +- cmake/projects/SDL2/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 7fc9262ab0..f3b6086527 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -120,7 +120,7 @@ hunter_config(QtCMakeExtra VERSION 1.0.27) hunter_config(QtQmlManager VERSION 1.0.0) hunter_config(RapidJSON VERSION 1.0.2-p2) hunter_config(RapidXML VERSION 1.13) -hunter_config(SDL2 VERSION 2.0.4-p4) +hunter_config(SDL2 VERSION 2.0.4-p5) hunter_config(SDL_image VERSION 2.0.1-p1) hunter_config(SDL_mixer VERSION 2.0.1-p1) hunter_config(SQLite3 VERSION autoconf-3080803) #R-Tree enabled diff --git a/cmake/projects/SDL2/hunter.cmake b/cmake/projects/SDL2/hunter.cmake index db0df8d508..2a912e16f9 100644 --- a/cmake/projects/SDL2/hunter.cmake +++ b/cmake/projects/SDL2/hunter.cmake @@ -6,6 +6,17 @@ include(hunter_download) include(hunter_pick_scheme) include(hunter_cacheable) +hunter_add_version( + PACKAGE_NAME + SDL2 + VERSION + "2.0.4-p5" + URL + "https://github.com/hunter-packages/SDL2/archive/2.0.4-p5.tar.gz" + SHA1 + 14dcb4c439f0dbd71ad0b92184b35e3a7f29e3ca +) + hunter_add_version( PACKAGE_NAME SDL2 From 5e24a79f9c72d04546018f05f5f5384e6dac4580 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sun, 22 Oct 2017 22:31:44 +0300 Subject: [PATCH 0074/1014] Docs: Fix link to example --- docs/packages/pkg/nlohmann_json.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/nlohmann_json.rst b/docs/packages/pkg/nlohmann_json.rst index 1d7b009e39..34578c1a97 100644 --- a/docs/packages/pkg/nlohmann_json.rst +++ b/docs/packages/pkg/nlohmann_json.rst @@ -11,7 +11,7 @@ nlohmann_json ============= - `Official `__ -- `Example `__ +- `Example `__ - V1.0.0 Available from `v0.12.13 `__ to From 7775b1240b1fac0c5ae3084a8351774789aae5d6 Mon Sep 17 00:00:00 2001 From: Sacha Date: Mon, 23 Oct 2017 09:24:35 +1000 Subject: [PATCH 0075/1014] Add PostgreSQL 10.0 --- cmake/configs/default.cmake | 2 +- cmake/projects/PostgreSQL/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index e1bb0a0430..78b53741c9 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -103,7 +103,7 @@ else() endif() hunter_config(PNG VERSION 1.6.26-p1) hunter_config(PocoCpp VERSION 1.7.9-p0) -hunter_config(PostgreSQL VERSION 9.6.3) +hunter_config(PostgreSQL VERSION 10.0.0) hunter_config(Protobuf VERSION 3.3.0) string(COMPARE EQUAL "${CMAKE_SYSTEM_NAME}" "Linux" _is_linux) diff --git a/cmake/projects/PostgreSQL/hunter.cmake b/cmake/projects/PostgreSQL/hunter.cmake index b0eabb15fc..9fa6eed823 100644 --- a/cmake/projects/PostgreSQL/hunter.cmake +++ b/cmake/projects/PostgreSQL/hunter.cmake @@ -10,6 +10,17 @@ include(hunter_pick_scheme) include(hunter_download) include(hunter_cmake_args) +hunter_add_version( + PACKAGE_NAME + PostgreSQL + VERSION + "10.0.0" + URL + "https://github.com/hunter-packages/PostgreSQL/archive/PostgreSQL-10.0.0.tar.gz" + SHA1 + d35d4e958509460347f39f0ba542a17eb2228f3c +) + hunter_add_version( PACKAGE_NAME PostgreSQL From 0d8d603c1a71056ecaa9fbf8e7bd633817fdfbfb Mon Sep 17 00:00:00 2001 From: isaachier Date: Mon, 23 Oct 2017 21:00:14 -0400 Subject: [PATCH 0076/1014] Add gRPC package (#1109) --- cmake/configs/default.cmake | 1 + cmake/projects/gRPC/hunter.cmake | 16 ++++++++++++++++ docs/packages/networking.rst | 2 ++ docs/packages/pkg/gRPC.rst | 22 ++++++++++++++++++++++ examples/gRPC/CMakeLists.txt | 16 ++++++++++++++++ examples/gRPC/config.cmake | 2 ++ examples/gRPC/main.cpp | 6 ++++++ 7 files changed, 65 insertions(+) create mode 100644 cmake/projects/gRPC/hunter.cmake create mode 100644 docs/packages/pkg/gRPC.rst create mode 100644 examples/gRPC/CMakeLists.txt create mode 100644 examples/gRPC/config.cmake create mode 100644 examples/gRPC/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 78b53741c9..eef5c8e9ff 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -189,6 +189,7 @@ hunter_config(glm VERSION 0.9.8.5) hunter_config(globjects VERSION 1.1.0-p0) hunter_config(glog VERSION 0.3.5-p1) hunter_config(glproto VERSION 1.4.17) +hunter_config(gRPC VERSION 1.6.6) hunter_config(gst_plugins_bad VERSION 1.10.4) hunter_config(gst_plugins_base VERSION 1.10.4) hunter_config(gst_plugins_good VERSION 1.10.4) diff --git a/cmake/projects/gRPC/hunter.cmake b/cmake/projects/gRPC/hunter.cmake new file mode 100644 index 0000000000..1d7c3c0234 --- /dev/null +++ b/cmake/projects/gRPC/hunter.cmake @@ -0,0 +1,16 @@ +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +include(hunter_add_version) +include(hunter_cacheable) +include(hunter_download) +include(hunter_pick_scheme) + +hunter_add_version( + PACKAGE_NAME gRPC + VERSION "1.6.6" + URL "https://github.com/isaachier/grpc/archive/hunter-1.6.6-p6.tar.gz" + SHA1 "c4abbf4a411f794f4cac2a0ec2311187b6fee31f") + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(gRPC) +hunter_download(PACKAGE_NAME gRPC) diff --git a/docs/packages/networking.rst b/docs/packages/networking.rst index b14beac156..289a9569a7 100644 --- a/docs/packages/networking.rst +++ b/docs/packages/networking.rst @@ -1,6 +1,7 @@ .. spelling:: c-ares + gRPC mDNS DNS websocket @@ -16,6 +17,7 @@ Networking - :ref:`pkg.c-ares` - A C library for asynchronous DNS requests - :ref:`pkg.CppNetlibUri` - C++ Network URI - :ref:`pkg.CURL` - A command line tool and library for transferring data with URL syntax + - :ref:`pkg.gRPC` - A high performance, open-source universal RPC framework - :ref:`pkg.Libevent` - An event notification library for developing scalable network servers. - :ref:`pkg.Libssh2` - :ref:`pkg.PocoCpp` - Cross-platform C++ libraries with a network/internet focus. diff --git a/docs/packages/pkg/gRPC.rst b/docs/packages/pkg/gRPC.rst new file mode 100644 index 0000000000..6da90252de --- /dev/null +++ b/docs/packages/pkg/gRPC.rst @@ -0,0 +1,22 @@ +.. spelling:: + + gRPC + grpc + +.. index:: networking ; gRPC + +.. _pkg.gRPC: + +gRPC +==== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `Isaac Hier `__ (`pr-1089 `__) + +.. code-block:: cmake + + hunter_add_package(gRPC) + find_package(gRPC CONFIG REQUIRED) + target_link_libraries(... gRPC::grpc) diff --git a/examples/gRPC/CMakeLists.txt b/examples/gRPC/CMakeLists.txt new file mode 100644 index 0000000000..df59c34de9 --- /dev/null +++ b/examples/gRPC/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.1) + +set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/config.cmake) +include("../common.cmake") + +project(download-gRPC) + +hunter_add_package(gRPC) + +set(CMAKE_CXX_STANDARD_REQUIRED true) +set(CMAKE_CXX_STANDARD 11) + +find_package(gRPC CONFIG REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main gRPC::grpc) diff --git a/examples/gRPC/config.cmake b/examples/gRPC/config.cmake new file mode 100644 index 0000000000..357b5f8759 --- /dev/null +++ b/examples/gRPC/config.cmake @@ -0,0 +1,2 @@ +hunter_config(ZLIB VERSION ${HUNTER_ZLIB_VERSION} + CMAKE_ARGS CMAKE_POSITION_INDEPENDENT_CODE=TRUE) diff --git a/examples/gRPC/main.cpp b/examples/gRPC/main.cpp new file mode 100644 index 0000000000..b59b0df963 --- /dev/null +++ b/examples/gRPC/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + return 0; +} From e8e9b183a9f57436448e59355c987d733f2748a9 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 24 Oct 2017 04:08:18 +0300 Subject: [PATCH 0077/1014] drishti 0.8.6 --- cmake/configs/default.cmake | 2 +- cmake/projects/drishti/hunter.cmake | 11 +++++++++++ examples/drishti/config.cmake | 14 +------------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index eef5c8e9ff..3cfc3175d1 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -166,7 +166,7 @@ hunter_config(doctest VERSION 1.2.0) hunter_config(double-conversion VERSION 3.0.0) hunter_config(dri2proto VERSION 2.8) hunter_config(dri3proto VERSION 1.0) -hunter_config(drishti VERSION 0.8.4) +hunter_config(drishti VERSION 0.8.6) hunter_config(drishti_assets VERSION 1.8) hunter_config(drishti_faces VERSION 1.2) hunter_config(drm VERSION 2.4.67) diff --git a/cmake/projects/drishti/hunter.cmake b/cmake/projects/drishti/hunter.cmake index f657740459..499e2b6053 100644 --- a/cmake/projects/drishti/hunter.cmake +++ b/cmake/projects/drishti/hunter.cmake @@ -20,6 +20,17 @@ hunter_add_version( 8d3bdc346073c0a1449b213fe374f6baf7589af1 ) +hunter_add_version( + PACKAGE_NAME + drishti + VERSION + 0.8.6 + URL + "https://github.com/elucideye/drishti/archive/v0.8.6.tar.gz" + SHA1 + 180161389f017719380f344e09f76fd1cdae609d +) + hunter_cmake_args(drishti CMAKE_ARGS DRISHTI_BUILD_EXAMPLES=NO) hunter_pick_scheme(DEFAULT url_sha1_cmake) diff --git a/examples/drishti/config.cmake b/examples/drishti/config.cmake index 915a369367..0f86d6658b 100644 --- a/examples/drishti/config.cmake +++ b/examples/drishti/config.cmake @@ -6,18 +6,6 @@ hunter_config( if(ANDROID) # https://travis-ci.org/ingenue/hunter/jobs/287844545 + # Will be fixed in Android NDK 17 hunter_config(dlib VERSION 19.2-p1) endif() - -if(MSVC) - # https://ci.appveyor.com/project/ingenue/hunter/build/1.0.2532/job/idmsw2829ry1ltj6 - hunter_config( - OpenCV - VERSION - 3.0.0-p11 - CMAKE_ARGS - WITH_IPP=OFF - BUILD_EIGEN=OFF - WITH_EIGEN=OFF - ) -endif() From 97e3ebc36327dbe93af2937b66ab8067b16151cf Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 24 Oct 2017 05:06:46 +0300 Subject: [PATCH 0078/1014] CURL 7.49.1-DEV-v9 --- cmake/configs/default.cmake | 2 +- cmake/projects/CURL/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index eef5c8e9ff..5a6612c712 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -50,7 +50,7 @@ hunter_config(BoostCompute VERSION 0.5-p0) hunter_config(BoostProcess VERSION 0.5) hunter_config(CapnProto VERSION 0.6.1) hunter_config(CLAPACK VERSION 3.2.1) -hunter_config(CURL VERSION 7.49.1-DEV-v8) +hunter_config(CURL VERSION 7.49.1-DEV-v9) hunter_config(Clang VERSION 4.0.1-p0) hunter_config(ClangToolsExtra VERSION 4.0.1) # Clang hunter_config(Comet VERSION 4.0.2) diff --git a/cmake/projects/CURL/hunter.cmake b/cmake/projects/CURL/hunter.cmake index 2323ea7682..d806b8b75f 100644 --- a/cmake/projects/CURL/hunter.cmake +++ b/cmake/projects/CURL/hunter.cmake @@ -43,6 +43,17 @@ hunter_add_version( 3ac2684e3274c17ca209731e121e9a0acc79e4a5 ) +hunter_add_version( + PACKAGE_NAME + CURL + VERSION + "7.49.1-DEV-v9" + URL + "https://github.com/hunter-packages/curl/archive/hunter-7.49.1-v9.tar.gz" + SHA1 + 4d4cb6e5faebfceaafa152bb3572c4760f1745cf +) + if (ANDROID OR IOS OR RASPBERRY_PI OR OPENWRT) set(_curl_cmake_args HAVE_GLIBC_STRERROR_R=1 From 1b0d027cf59b16be95948ba0b03982bf145f25bd Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 24 Oct 2017 22:25:20 +0300 Subject: [PATCH 0079/1014] Fix OpenSSL 1.1.0+ (Windows) --- cmake/configs/default.cmake | 7 +------ cmake/find/FindOpenSSL.cmake | 11 +++++++++++ .../url_sha1_openssl_windows_1_1_plus.cmake.in | 12 ++++++++---- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 5a6612c712..890dcd04a7 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -95,12 +95,7 @@ hunter_config(OpenCL-cpp VERSION 2.0.10-p0) hunter_config(OpenCV VERSION 3.3.0-p2) hunter_config(OpenCV-Extra VERSION 3.3.0) hunter_config(OpenNMTTokenizer VERSION 0.2.0-p1) -if(MSVC) - # FIXME: https://ci.appveyor.com/project/ingenue/hunter/build/1.0.1470 - hunter_config(OpenSSL VERSION 1.0.2l) -else() - hunter_config(OpenSSL VERSION 1.1.0f) -endif() +hunter_config(OpenSSL VERSION 1.1.0f) hunter_config(PNG VERSION 1.6.26-p1) hunter_config(PocoCpp VERSION 1.7.9-p0) hunter_config(PostgreSQL VERSION 10.0.0) diff --git a/cmake/find/FindOpenSSL.cmake b/cmake/find/FindOpenSSL.cmake index 31c2f671ae..5215fd3149 100644 --- a/cmake/find/FindOpenSSL.cmake +++ b/cmake/find/FindOpenSSL.cmake @@ -118,8 +118,11 @@ if(WIN32 AND NOT CYGWIN) find_library(LIB_EAY_DEBUG NAMES + libcrypto${_OPENSSL_MSVC_RT_MODE}d + libcryptod libeay32${_OPENSSL_MSVC_RT_MODE}d libeay32d + cryptod HINTS "${OPENSSL_ROOT}" PATH_SUFFIXES @@ -128,8 +131,11 @@ if(WIN32 AND NOT CYGWIN) find_library(LIB_EAY_RELEASE NAMES + libcrypto${_OPENSSL_MSVC_RT_MODE} + libcrypto libeay32${_OPENSSL_MSVC_RT_MODE} libeay32 + crypto HINTS "${OPENSSL_ROOT}" PATH_SUFFIXES @@ -138,8 +144,11 @@ if(WIN32 AND NOT CYGWIN) find_library(SSL_EAY_DEBUG NAMES + libssl${_OPENSSL_MSVC_RT_MODE}d + libssld ssleay32${_OPENSSL_MSVC_RT_MODE}d ssleay32d + ssld HINTS "${OPENSSL_ROOT}" PATH_SUFFIXES @@ -148,6 +157,8 @@ if(WIN32 AND NOT CYGWIN) find_library(SSL_EAY_RELEASE NAMES + libssl${_OPENSSL_MSVC_RT_MODE} + libssl ssleay32${_OPENSSL_MSVC_RT_MODE} ssleay32 ssl diff --git a/cmake/projects/OpenSSL/schemes/url_sha1_openssl_windows_1_1_plus.cmake.in b/cmake/projects/OpenSSL/schemes/url_sha1_openssl_windows_1_1_plus.cmake.in index 9e5ff53427..18c21ff6da 100644 --- a/cmake/projects/OpenSSL/schemes/url_sha1_openssl_windows_1_1_plus.cmake.in +++ b/cmake/projects/OpenSSL/schemes/url_sha1_openssl_windows_1_1_plus.cmake.in @@ -71,6 +71,9 @@ else() set(log_opts "") endif() +set(openssl_dir "@HUNTER_PACKAGE_INSTALL_PREFIX@/ssl") +file(MAKE_DIRECTORY "${openssl_dir}") + ExternalProject_Add( "@HUNTER_EP_NAME@" URL @@ -87,15 +90,16 @@ ExternalProject_Add( CONFIGURE_COMMAND "@HUNTER_MSVC_VCVARSALL@" "@HUNTER_MSVC_ARCH@" COMMAND - perl Configure "${opt}" "--prefix=@HUNTER_PACKAGE_INSTALL_PREFIX@" + perl Configure "${opt}" no-asm "--prefix=@HUNTER_PACKAGE_INSTALL_PREFIX@" "--openssldir=${openssl_dir}" COMMAND nmake + COMMAND + nmake install + BUILD_COMMAND + "@CMAKE_COMMAND@" -E echo "Dummy build step" BUILD_IN_SOURCE 1 INSTALL_COMMAND - COMMAND - nmake install - COMMAND # Copy license files "@CMAKE_COMMAND@" "-C@HUNTER_ARGS_FILE@" # for 'HUNTER_INSTALL_LICENSE_FILES' "-Dsrcdir=@HUNTER_PACKAGE_SOURCE_DIR@" From 0a492c7cbf00ecb72491f4e560dacacaf1d2099e Mon Sep 17 00:00:00 2001 From: OvermindDL1 Date: Tue, 24 Oct 2017 21:41:58 -0600 Subject: [PATCH 0080/1014] Document `Boost::math` oddities (#1099) --- docs/packages/pkg/Boost.rst | 27 +++++++++++++++++++++++++++ examples/Boost-math/CMakeLists.txt | 28 ++++++++++++++++++++++++++++ examples/Boost-math/foo.cpp | 5 +++++ 3 files changed, 60 insertions(+) create mode 100644 examples/Boost-math/CMakeLists.txt create mode 100644 examples/Boost-math/foo.cpp diff --git a/docs/packages/pkg/Boost.rst b/docs/packages/pkg/Boost.rst index c70121d7a2..bdb5515908 100644 --- a/docs/packages/pkg/Boost.rst +++ b/docs/packages/pkg/Boost.rst @@ -27,6 +27,7 @@ Examples: - `Boost-system `__ - `Boost-iostreams `__ - `Boost-filesystem `__ +- `Boost-math `__ List of components (other libraries are header-only): @@ -89,6 +90,32 @@ For example: - `boost.iostreams options `__ +Math +----------- + +When using Boost Math you will need to link in the libraries, however these are not named ``math`` but +rather are individual based on what you need to link it, the easiest of which is to link in all parts: + +.. code-block:: cmake + + hunter_add_package(Boost COMPONENTS math) + find_package(Boost CONFIG REQUIRED math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l) + target_link_libraries(... + Boost::math_c99 + Boost::math_c99f + Boost::math_c99l + Boost::math_tr1 + Boost::math_tr1f + Boost::math_tr1l + ) + +If you are using only the header-only parts of Boost::Math then the libraries can be ignored: + +.. code-block:: cmake + + hunter_add_package(Boost COMPONENTS math) + find_package(Boost CONFIG REQUIRED) + Bugs ---- diff --git a/examples/Boost-math/CMakeLists.txt b/examples/Boost-math/CMakeLists.txt new file mode 100644 index 0000000000..843235678c --- /dev/null +++ b/examples/Boost-math/CMakeLists.txt @@ -0,0 +1,28 @@ +# Copyright (c) 2013, Ruslan Baratov +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-boost) + +# download boost +hunter_add_package(Boost COMPONENTS math) + +# now boost::math_* targets +# link in all the parts of boost math, or leave out unneeded parts +find_package(Boost CONFIG REQUIRED math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l) +add_executable(foo foo.cpp) +# link in the libraries as well for whatever is found above in find_package +target_link_libraries(foo + Boost::math_c99 + Boost::math_c99f + Boost::math_c99l + Boost::math_tr1 + Boost::math_tr1f + Boost::math_tr1l +) + diff --git a/examples/Boost-math/foo.cpp b/examples/Boost-math/foo.cpp new file mode 100644 index 0000000000..003b520e90 --- /dev/null +++ b/examples/Boost-math/foo.cpp @@ -0,0 +1,5 @@ +#include + +int main() { +} + From 228ce7fd040cf3eaaed8367acff3837ac87f8a83 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Wed, 25 Oct 2017 06:43:37 +0300 Subject: [PATCH 0081/1014] Docs: Small fix --- docs/packages/pkg/Boost.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/Boost.rst b/docs/packages/pkg/Boost.rst index bdb5515908..35d2aa3807 100644 --- a/docs/packages/pkg/Boost.rst +++ b/docs/packages/pkg/Boost.rst @@ -91,7 +91,7 @@ For example: options `__ Math ------------ +---- When using Boost Math you will need to link in the libraries, however these are not named ``math`` but rather are individual based on what you need to link it, the easiest of which is to link in all parts: From 4e9b1c66ba0b333a5592ad6e26ae7ce0768344cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20M=C3=A1rtonka?= Date: Wed, 25 Oct 2017 06:20:49 -0400 Subject: [PATCH 0082/1014] Added yaml-cpp 0.5.3-plus-p0 release to hunter. --- cmake/configs/default.cmake | 2 +- cmake/projects/yaml-cpp/hunter.cmake | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 3ddd2243b9..6cf8a482a7 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -279,7 +279,7 @@ hunter_config(xrender VERSION 0.9.7) hunter_config(xshmfence VERSION 1.2) hunter_config(xtrans VERSION 1.2.7) hunter_config(xxf86vm VERSION 1.1.2) -hunter_config(yaml-cpp VERSION 0.5.3) +hunter_config(yaml-cpp VERSION 0.5.3-plus-p0) if(MSVC80) hunter_config(GTest VERSION 1.7.0-hunter-6) diff --git a/cmake/projects/yaml-cpp/hunter.cmake b/cmake/projects/yaml-cpp/hunter.cmake index 7fefb2c9e8..1586ff33f3 100644 --- a/cmake/projects/yaml-cpp/hunter.cmake +++ b/cmake/projects/yaml-cpp/hunter.cmake @@ -17,6 +17,18 @@ hunter_add_version( ee1fe3713409de48b203f6b631c1284190d95671 ) +hunter_add_version( + PACKAGE_NAME + yaml-cpp + VERSION + "0.5.3-plus-p0" + URL + "https://github.com/hunter-packages/yaml-cpp/archive/release-0.5.3-plus-p0.zip" + SHA1 + 3f612ceea5c983748368b6a543678f3d77e5ecc8 + ) + + hunter_cmake_args(yaml-cpp CMAKE_ARGS YAML_CPP_BUILD_TOOLS=OFF) hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(yaml-cpp) From c41bdf483aeaabe74cf8335f2974f123ba2f8a8b Mon Sep 17 00:00:00 2001 From: isaachier Date: Thu, 26 Oct 2017 08:10:44 -0400 Subject: [PATCH 0083/1014] Fix segfault in flex found in new gcc versions (#1119) --- cmake/projects/flex/hunter.cmake | 6 ++- .../schemes/url_sha1_flex_autotools.cmake.in | 51 +++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 cmake/projects/flex/schemes/url_sha1_flex_autotools.cmake.in diff --git a/cmake/projects/flex/hunter.cmake b/cmake/projects/flex/hunter.cmake index b90bf80a98..8361573358 100644 --- a/cmake/projects/flex/hunter.cmake +++ b/cmake/projects/flex/hunter.cmake @@ -2,6 +2,7 @@ include(hunter_add_version) include(hunter_cacheable) +include(hunter_cmake_args) include(hunter_configuration_types) include(hunter_download) include(hunter_pick_scheme) @@ -18,6 +19,7 @@ hunter_add_version( ) hunter_configuration_types(flex CONFIGURATION_TYPES Release) -hunter_pick_scheme(DEFAULT url_sha1_autotools) +hunter_pick_scheme(DEFAULT url_sha1_flex_autotools) hunter_cacheable(flex) -hunter_download(PACKAGE_NAME flex) +hunter_download(PACKAGE_NAME flex + PACKAGE_INTERNAL_DEPS_ID "1") diff --git a/cmake/projects/flex/schemes/url_sha1_flex_autotools.cmake.in b/cmake/projects/flex/schemes/url_sha1_flex_autotools.cmake.in new file mode 100644 index 0000000000..e5374c56fe --- /dev/null +++ b/cmake/projects/flex/schemes/url_sha1_flex_autotools.cmake.in @@ -0,0 +1,51 @@ +cmake_minimum_required(VERSION 3.0) +project(Hunter) + +list(APPEND CMAKE_MODULE_PATH "@HUNTER_SELF@/cmake/modules") + +include(hunter_autotools_project) +include(hunter_status_debug) +include(hunter_test_string_not_empty) +include(hunter_user_error) + +hunter_status_debug("Scheme: url_sha1_flex_autotools") + +if("@MSVC@") + hunter_user_error("Autotools scheme not supported with Visual Studio") +endif() + +# Check preconditions +hunter_test_string_not_empty("@HUNTER_SELF@") +hunter_test_string_not_empty("@HUNTER_EP_NAME@") +hunter_test_string_not_empty("@HUNTER_PACKAGE_URL@") +hunter_test_string_not_empty("@HUNTER_PACKAGE_SHA1@") +hunter_test_string_not_empty("@HUNTER_PACKAGE_DOWNLOAD_DIR@") +hunter_test_string_not_empty("@HUNTER_PACKAGE_SOURCE_DIR@") +hunter_test_string_not_empty("@HUNTER_PACKAGE_BUILD_DIR@") +hunter_test_string_not_empty("@HUNTER_PACKAGE_INSTALL_PREFIX@") +hunter_test_string_not_empty("@HUNTER_INSTALL_PREFIX@") + +hunter_autotools_project("@HUNTER_EP_NAME@" + HUNTER_SELF + "@HUNTER_SELF@" + URL + @HUNTER_PACKAGE_URL@ + URL_HASH + SHA1=@HUNTER_PACKAGE_SHA1@ + DOWNLOAD_DIR + "@HUNTER_PACKAGE_DOWNLOAD_DIR@" + SOURCE_DIR + "@HUNTER_PACKAGE_SOURCE_DIR@" + BUILD_DIR + "@HUNTER_PACKAGE_BUILD_DIR@" + INSTALL_DIR + "@HUNTER_PACKAGE_INSTALL_PREFIX@" + GLOBAL_INSTALL_DIR + "@HUNTER_INSTALL_PREFIX@" + PARALLEL_JOBS + "@HUNTER_JOBS_OPTION@" + PACKAGE_CONFIGURATION_TYPES + "@HUNTER_PACKAGE_CONFIGURATION_TYPES@" + CPPFLAGS + "-D_GNU_SOURCE" +) From 1c1f821b1f2cc806edd4be0c773a63e40b206aa2 Mon Sep 17 00:00:00 2001 From: Knitschi Date: Fri, 27 Oct 2017 14:48:08 +0200 Subject: [PATCH 0084/1014] Add latest GTest release. (#1122) --- cmake/configs/default.cmake | 2 +- cmake/projects/GTest/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 6cf8a482a7..f4b5b07cdc 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -284,7 +284,7 @@ hunter_config(yaml-cpp VERSION 0.5.3-plus-p0) if(MSVC80) hunter_config(GTest VERSION 1.7.0-hunter-6) else() - hunter_config(GTest VERSION 1.8.0-hunter-p7) + hunter_config(GTest VERSION 1.8.0-hunter-p8) endif() if(ANDROID) diff --git a/cmake/projects/GTest/hunter.cmake b/cmake/projects/GTest/hunter.cmake index 3949ec0cdd..7603f08cf7 100644 --- a/cmake/projects/GTest/hunter.cmake +++ b/cmake/projects/GTest/hunter.cmake @@ -183,6 +183,17 @@ hunter_add_version( 4fe083a96d7597f7dce6f453dca01e1d94a1e45b ) +hunter_add_version( + PACKAGE_NAME + GTest + VERSION + 1.8.0-hunter-p8 + URL + "https://github.com/hunter-packages/googletest/archive/1.8.0-hunter-p8.tar.gz" + SHA1 + 1cdd396b20c8d29f7ea08baaa49673b1c261f545 +) + if(HUNTER_GTest_VERSION VERSION_LESS 1.8.0) set(_gtest_license "LICENSE") else() From 591d3c66cd69f474f05d2c24e756299d1916578e Mon Sep 17 00:00:00 2001 From: Tom Mason Date: Fri, 27 Oct 2017 19:25:22 +0200 Subject: [PATCH 0085/1014] Add docs for some packages I added --- docs/packages/graphics.rst | 1 + docs/packages/media.rst | 1 + docs/packages/pkg/SDL2.rst | 10 +++++----- docs/packages/pkg/SDL_image.rst | 26 +++++++++++--------------- docs/packages/pkg/SDL_mixer.rst | 25 ++++++++++--------------- docs/packages/pkg/stormlib.rst | 23 +++++++++-------------- docs/packages/pkg/zookeeper.rst | 24 ++++++++++-------------- docs/spelling.txt | 1 + 8 files changed, 48 insertions(+), 63 deletions(-) diff --git a/docs/packages/graphics.rst b/docs/packages/graphics.rst index 2b9def98dc..c141566789 100644 --- a/docs/packages/graphics.rst +++ b/docs/packages/graphics.rst @@ -9,3 +9,4 @@ Graphics 2D/3D - :ref:`pkg.Assimp` - portable Open Source library to import various well-known 3D model formats in a uniform manner - :ref:`pkg.freetype` - render freetype fonts - :ref:`pkg.ogles_gpgpu` - GPGPU for mobile devices and embedded systems using OpenGL ES 2.0 + - :ref:`pkg.SDL2` - A cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D. diff --git a/docs/packages/media.rst b/docs/packages/media.rst index 8ffdeeec28..73f4317e95 100644 --- a/docs/packages/media.rst +++ b/docs/packages/media.rst @@ -5,3 +5,4 @@ Media - :ref:`pkg.libyuv` - YUV scaling and conversion functionality. - :ref:`pkg.PNG` - library for use in applications that read, create, and manipulate PNG (Portable Network Graphics) raster image files. - :ref:`pkg.TIFF` + - :ref:`pkg.SDL_mixer` - A sample multi-channel audio mixer library for SDL. diff --git a/docs/packages/pkg/SDL2.rst b/docs/packages/pkg/SDL2.rst index aa38496935..958ffcedc7 100644 --- a/docs/packages/pkg/SDL2.rst +++ b/docs/packages/pkg/SDL2.rst @@ -2,7 +2,7 @@ SDL2 -.. index:: unsorted ; SDL2 +.. index:: graphics ; SDL2 .. _pkg.SDL2: @@ -12,9 +12,9 @@ SDL2 - `Official `__ - `Hunterized `__ -.. - `__FIXME__ Example `__ -.. - Available since `__FIXME__ vX.Y.Z `__ -.. - Added by `__FIXME__ `__ (`__FIXME__ pr-N `__) +- `Example `__ +- Available since `v0.14.29 `__ +- Added by `Cyberunner23 `__ (`pr-451 `__) .. code-block:: cmake @@ -23,4 +23,4 @@ SDL2 #... target_link_libraries(... SDL2::SDL2) -Available targets: ``SDL2::SDL2``, ``SDL2::SDL2-static``, ``SDL2::SDL2main`` +Available targets: ``SDL2::SDL2``, ``SDL2::SDL2main`` diff --git a/docs/packages/pkg/SDL_image.rst b/docs/packages/pkg/SDL_image.rst index 48af08809c..5fb632042c 100644 --- a/docs/packages/pkg/SDL_image.rst +++ b/docs/packages/pkg/SDL_image.rst @@ -2,27 +2,23 @@ SDL_image -.. index:: unsorted ; SDL_image +.. index:: graphics ; SDL_image .. _pkg.SDL_image: SDL_image ========= -.. warning:: - - This page is a template and contains no real information. - Please send pull request with real description. - -- `__FIXME__ Official `__ -- `__FIXME__ Hunterized `__ -- `__FIXME__ Example `__ -- Available since `__FIXME__ vX.Y.Z `__ -- Added by `__FIXME__ `__ (`__FIXME__ pr-N `__) +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Available since `v0.19.86 `__ +- Added by `wheybags `__ (`pr-989 `__) .. code-block:: cmake - hunter_add_package(__FIXME__) - find_package(__FIXME__ CONFIG REQUIRED) - target_link_libraries(foo __FIXME__::__FIXME__) - + hunter_add_package(SDL_image) + find_package(SDL_image CONFIG REQUIRED) + #... + target_link_libraries(main + SDL_image::SDL_image) diff --git a/docs/packages/pkg/SDL_mixer.rst b/docs/packages/pkg/SDL_mixer.rst index c1372fb183..7b94fed7da 100644 --- a/docs/packages/pkg/SDL_mixer.rst +++ b/docs/packages/pkg/SDL_mixer.rst @@ -2,27 +2,22 @@ SDL_mixer -.. index:: unsorted ; SDL_mixer +.. index:: media ; SDL_mixer .. _pkg.SDL_mixer: SDL_mixer ========= -.. warning:: - - This page is a template and contains no real information. - Please send pull request with real description. - -- `__FIXME__ Official `__ -- `__FIXME__ Hunterized `__ -- `__FIXME__ Example `__ -- Available since `__FIXME__ vX.Y.Z `__ -- Added by `__FIXME__ `__ (`__FIXME__ pr-N `__) +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Available since `v0.19.56 `__ +- Added by `wheybags `__ (`pr-924 `__) .. code-block:: cmake - hunter_add_package(__FIXME__) - find_package(__FIXME__ CONFIG REQUIRED) - target_link_libraries(foo __FIXME__::__FIXME__) - + hunter_add_package(SDL_mixer) + find_package(SDL_mixer CONFIG REQUIRED) + #... + target_link_libraries(foo SDL_mixer::SDL_mixer) diff --git a/docs/packages/pkg/stormlib.rst b/docs/packages/pkg/stormlib.rst index 932bac38f1..e4ea0eace8 100644 --- a/docs/packages/pkg/stormlib.rst +++ b/docs/packages/pkg/stormlib.rst @@ -9,20 +9,15 @@ stormlib ======== -.. warning:: - - This page is a template and contains no real information. - Please send pull request with real description. - -- `__FIXME__ Official `__ -- `__FIXME__ Hunterized `__ -- `__FIXME__ Example `__ -- Available since `__FIXME__ vX.Y.Z `__ -- Added by `__FIXME__ `__ (`__FIXME__ pr-N `__) +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Available since `v0.19.83 `__ +- Added by `wheybags `__ (`pr-877 `__) .. code-block:: cmake - hunter_add_package(__FIXME__) - find_package(__FIXME__ CONFIG REQUIRED) - target_link_libraries(foo __FIXME__::__FIXME__) - + hunter_add_package(stormlib) + find_package(stormlib CONFIG REQUIRED) + #... + target_link_libraries(foo stormlib::stormlib) diff --git a/docs/packages/pkg/zookeeper.rst b/docs/packages/pkg/zookeeper.rst index 2243c186f1..3d819a6326 100644 --- a/docs/packages/pkg/zookeeper.rst +++ b/docs/packages/pkg/zookeeper.rst @@ -9,20 +9,16 @@ zookeeper ========= -.. warning:: - - This page is a template and contains no real information. - Please send pull request with real description. - -- `__FIXME__ Official `__ -- `__FIXME__ Hunterized `__ -- `__FIXME__ Example `__ -- Available since `__FIXME__ vX.Y.Z `__ -- Added by `__FIXME__ `__ (`__FIXME__ pr-N `__) +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Available since `v0.18.5 `__ +- Added by ``__ (`pr-639 `__) .. code-block:: cmake - hunter_add_package(__FIXME__) - find_package(__FIXME__ CONFIG REQUIRED) - target_link_libraries(foo __FIXME__::__FIXME__) - + hunter_add_package(zookeeper) + find_package(zookeeper CONFIG REQUIRED) + #... + target_link_libraries(foo zookeeper::zookeeper_mt) + #target_link_libraries(foo zookeeper::zookeeper_st) # if you want the single-threaded lib instead diff --git a/docs/spelling.txt b/docs/spelling.txt index f587de54a7..df7fe8a3f7 100644 --- a/docs/spelling.txt +++ b/docs/spelling.txt @@ -52,3 +52,4 @@ subfolder submodules toolchain toolchains +multi From f8260a0ce6c114a73b2e3a567c8ce8dc1e9b6e76 Mon Sep 17 00:00:00 2001 From: isaachier Date: Fri, 27 Oct 2017 18:02:28 -0400 Subject: [PATCH 0086/1014] Make OpenSSL work with POSITION_INDEPENDENT_CODE (#1121) --- cmake/modules/hunter_dump_cmake_flags.cmake | 11 ++++++----- cmake/projects/OpenSSL/hunter.cmake | 2 +- .../OpenSSL/schemes/url_sha1_openssl.cmake.in | 9 ++++++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/cmake/modules/hunter_dump_cmake_flags.cmake b/cmake/modules/hunter_dump_cmake_flags.cmake index f0a680e9de..46e7eb3898 100644 --- a/cmake/modules/hunter_dump_cmake_flags.cmake +++ b/cmake/modules/hunter_dump_cmake_flags.cmake @@ -12,8 +12,9 @@ include(hunter_test_string_not_empty) # * OpenSSL # * odb-boost function(hunter_dump_cmake_flags) - cmake_parse_arguments(x "SKIP_INCLUDES" "CPPFLAGS" "" "${ARGV}") + cmake_parse_arguments(x "SKIP_INCLUDES" "SKIP_PIC" "CPPFLAGS" "" "${ARGV}") # -> x_SKIP_INCLUDES + # -> x_SKIP_PIC # -> x_CPPFLAGS string(COMPARE NOTEQUAL "${x_UNPARSED_ARGUMENTS}" "" has_unparsed) @@ -32,11 +33,11 @@ function(hunter_dump_cmake_flags) set(CMAKE_CXX_FLAGS "-miphoneos-version-min=${IOS_DEPLOYMENT_SDK_VERSION}") set(CMAKE_C_FLAGS "-miphoneos-version-min=${IOS_DEPLOYMENT_SDK_VERSION}") endif() - + if(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fembed-bitcode") - endif() + endif() endif() set(cppflags "") @@ -123,14 +124,14 @@ function(hunter_dump_cmake_flags) # PIC { string(COMPARE NOTEQUAL "${CMAKE_CXX_COMPILE_OPTIONS_PIC}" "" has_pic) - if(CMAKE_POSITION_INDEPENDENT_CODE AND has_pic) + if(CMAKE_POSITION_INDEPENDENT_CODE AND has_pic AND NOT x_SKIP_PIC) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_PIC}" ) endif() string(COMPARE NOTEQUAL "${CMAKE_C_COMPILE_OPTIONS_PIC}" "" has_pic) - if(CMAKE_POSITION_INDEPENDENT_CODE AND has_pic) + if(CMAKE_POSITION_INDEPENDENT_CODE AND has_pic AND NOT x_SKIP_PIC) set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_COMPILE_OPTIONS_PIC}" ) diff --git a/cmake/projects/OpenSSL/hunter.cmake b/cmake/projects/OpenSSL/hunter.cmake index 8f4e726755..f0a59f2db5 100755 --- a/cmake/projects/OpenSSL/hunter.cmake +++ b/cmake/projects/OpenSSL/hunter.cmake @@ -318,4 +318,4 @@ if(MINGW) endif() hunter_cacheable(OpenSSL) -hunter_download(PACKAGE_NAME OpenSSL PACKAGE_INTERNAL_DEPS_ID "14") +hunter_download(PACKAGE_NAME OpenSSL PACKAGE_INTERNAL_DEPS_ID "15") diff --git a/cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in b/cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in index 8942a14070..b1e0cb9668 100644 --- a/cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in +++ b/cmake/projects/OpenSSL/schemes/url_sha1_openssl.cmake.in @@ -52,7 +52,14 @@ else() set(configure_command "./config") endif() -hunter_dump_cmake_flags(SKIP_INCLUDES) +set(skip_pic "") +if(APPLE) + # Apple cannot process `-fPIC` flag argument + # (https://github.com/ruslo/hunter/pull/1109#discussion_r146360981) + set(skip_pic SKIP_PIC) +endif() + +hunter_dump_cmake_flags(SKIP_INCLUDES ${skip_pic}) # -> CMAKE_CXX_FLAGS # -> CMAKE_C_FLAGS From e4c551264ea01cfaf9b59e3f685d886d2a9093b0 Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Sat, 28 Oct 2017 19:07:59 -0400 Subject: [PATCH 0087/1014] Add OpenAL package --- cmake/configs/default.cmake | 1 + cmake/projects/OpenAL/hunter.cmake | 16 ++++++++++++++++ docs/packages/media.rst | 5 +++++ docs/packages/pkg/OpenAL.rst | 20 ++++++++++++++++++++ examples/OpenAL/CMakeLists.txt | 12 ++++++++++++ examples/OpenAL/main.cpp | 6 ++++++ 6 files changed, 60 insertions(+) create mode 100644 cmake/projects/OpenAL/hunter.cmake create mode 100644 docs/packages/pkg/OpenAL.rst create mode 100644 examples/OpenAL/CMakeLists.txt create mode 100644 examples/OpenAL/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index f4b5b07cdc..d125123033 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -89,6 +89,7 @@ hunter_config(Libssh2 VERSION 1.7.0) hunter_config(Lua VERSION 5.3.2) hunter_config(MySQL-client VERSION 6.1.9-p0) hunter_config(NASM VERSION 2.12.02) +hunter_config(OpenAL VERSION 1.18.2) hunter_config(OpenBLAS VERSION 0.2.20-p0) hunter_config(OpenCL VERSION 2.1-p3) hunter_config(OpenCL-cpp VERSION 2.0.10-p0) diff --git a/cmake/projects/OpenAL/hunter.cmake b/cmake/projects/OpenAL/hunter.cmake new file mode 100644 index 0000000000..be6b31b0c1 --- /dev/null +++ b/cmake/projects/OpenAL/hunter.cmake @@ -0,0 +1,16 @@ +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +include(hunter_add_version) +include(hunter_cacheable) +include(hunter_download) +include(hunter_pick_scheme) + +hunter_add_version( + PACKAGE_NAME OpenAL + VERSION "1.18.2" + URL "https://github.com/kcat/openal-soft/archive/openal-soft-1.18.2.tar.gz" + SHA1 "f819c6720c4beead7653ebc35fbb2c287a8970fc") + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(OpenAL) +hunter_download(PACKAGE_NAME OpenAL) diff --git a/docs/packages/media.rst b/docs/packages/media.rst index 8ffdeeec28..549c19f980 100644 --- a/docs/packages/media.rst +++ b/docs/packages/media.rst @@ -1,7 +1,12 @@ +.. spelling:: + + OpenAL + Media ----- - :ref:`pkg.Jpeg` - library for JPEG image compression. - :ref:`pkg.libyuv` - YUV scaling and conversion functionality. + - :ref:`pkg.OpenAL` - software implementation of the OpenAL 3D audio API. - :ref:`pkg.PNG` - library for use in applications that read, create, and manipulate PNG (Portable Network Graphics) raster image files. - :ref:`pkg.TIFF` diff --git a/docs/packages/pkg/OpenAL.rst b/docs/packages/pkg/OpenAL.rst new file mode 100644 index 0000000000..01bf5979c8 --- /dev/null +++ b/docs/packages/pkg/OpenAL.rst @@ -0,0 +1,20 @@ +.. spelling:: + + OpenAL + +.. index:: media ; OpenAL + +.. _pkg.OpenAL: + +OpenAL +====== + +- `Official `__ +- `Example `__ +- Added by `Isaac Hier `__ (`pr-1128 `__) + +.. code-block:: cmake + + hunter_add_package(OpenAL) + find_package(OpenAL CONFIG REQUIRED) + target_link_libraries(... OpenAL::OpenAL) diff --git a/examples/OpenAL/CMakeLists.txt b/examples/OpenAL/CMakeLists.txt new file mode 100644 index 0000000000..9a7177034f --- /dev/null +++ b/examples/OpenAL/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.1) + +include("../common.cmake") + +project(download-OpenAL) + +hunter_add_package(OpenAL) + +find_package(OpenAL CONFIG REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main OpenAL::OpenAL) diff --git a/examples/OpenAL/main.cpp b/examples/OpenAL/main.cpp new file mode 100644 index 0000000000..d5724a643a --- /dev/null +++ b/examples/OpenAL/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + return 0; +} From 9e06899162229429eed835c73b3244d4056d72fa Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sun, 29 Oct 2017 21:54:14 +0300 Subject: [PATCH 0088/1014] Docs: Few notes for running Python script on Windows --- docs/creating-new/create/cmake.rst | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/docs/creating-new/create/cmake.rst b/docs/creating-new/create/cmake.rst index 5d7429bb23..0e585dbd59 100644 --- a/docs/creating-new/create/cmake.rst +++ b/docs/creating-new/create/cmake.rst @@ -437,10 +437,39 @@ Go back to Hunter repository and run test: .. code-block:: none > cd hunter + [hunter]> which polly.py /.../bin/polly.py + + [hunter]> polly.py --help + Python version: 3.5 + usage: polly.py [-h] + ... + [hunter]> TOOLCHAIN=gcc PROJECT_DIR=examples/hunter_box_1 ./jenkins.py +On Windows: + +.. code-block:: none + + > cd hunter + + [hunter]> where polly.py + C:\...\bin\polly.py + + [hunter]> polly.py --help + Python version: 3.5 + usage: polly.py [-h] + ... + + [hunter]> set TOOLCHAIN=vs-12-2013 + [hunter]> set PROJECT_DIR=examples\hunter_box_1 + [hunter]> .\jenkins.py + +.. admonition:: Stackoverflow + + * `How to execute Python scripts in Windows? `__ + .. _ci testing: CI testing From 79b3645ae22222844373e53edc7e900ccd1c6128 Mon Sep 17 00:00:00 2001 From: dvirtz Date: Sun, 29 Oct 2017 23:13:44 +0200 Subject: [PATCH 0089/1014] add debug_assert (#1127) --- cmake/configs/default.cmake | 1 + cmake/projects/debug_assert/hunter.cmake | 26 +++++++++ docs/packages/pkg/debug_assert.rst | 20 +++++++ examples/debug_assert/CMakeLists.txt | 20 +++++++ examples/debug_assert/main.cpp | 68 ++++++++++++++++++++++++ 5 files changed, 135 insertions(+) create mode 100644 cmake/projects/debug_assert/hunter.cmake create mode 100644 docs/packages/pkg/debug_assert.rst create mode 100644 examples/debug_assert/CMakeLists.txt create mode 100644 examples/debug_assert/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index d125123033..2ebb4889f7 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -156,6 +156,7 @@ hunter_config(czmq VERSION 4.0.2-p1) hunter_config(c-ares VERSION 1.13.0) hunter_config(damageproto VERSION 1.2.1) hunter_config(dbus VERSION 1.10.0-hunter-4) +hunter_config(debug_assert VERSION 1.2) hunter_config(dest VERSION 0.8.0-p4) hunter_config(dlib VERSION 19.6-p1) hunter_config(doctest VERSION 1.2.0) diff --git a/cmake/projects/debug_assert/hunter.cmake b/cmake/projects/debug_assert/hunter.cmake new file mode 100644 index 0000000000..19defec27c --- /dev/null +++ b/cmake/projects/debug_assert/hunter.cmake @@ -0,0 +1,26 @@ +# cmake/projects/Example/hunter.cmake + +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +# Load used modules +include(hunter_add_version) +include(hunter_download) +include(hunter_pick_scheme) +include(hunter_cacheable) + +# List of versions here... +hunter_add_version( + PACKAGE_NAME + debug_assert + VERSION + "1.2" + URL + "https://github.com/foonathan/debug_assert/archive/v1.2.tar.gz" + SHA1 + 0cc89e62d79198fe5df4fda9337bb3e44a0d58c3 +) + +# Pick a download scheme +hunter_pick_scheme(DEFAULT url_sha1_cmake) # use scheme for cmake projects +hunter_cacheable(debug_assert) +hunter_download(PACKAGE_NAME debug_assert) diff --git a/docs/packages/pkg/debug_assert.rst b/docs/packages/pkg/debug_assert.rst new file mode 100644 index 0000000000..4826575ac2 --- /dev/null +++ b/docs/packages/pkg/debug_assert.rst @@ -0,0 +1,20 @@ +.. spelling:: + + debug_assert + +.. index:: unsorted ; debug_assert + +.. _pkg.debug_assert: + +debug_assert +============ + +- `Official `__ +- `Example `__ +- Added by `dvirtz `__ (`pr-1127 `__) + +.. code-block:: cmake + + hunter_add_package(debug_assert) + find_package(debug_assert CONFIG REQUIRED) + target_link_libraries(debug_assert_example debug_assert) diff --git a/examples/debug_assert/CMakeLists.txt b/examples/debug_assert/CMakeLists.txt new file mode 100644 index 0000000000..4a22ad7b8e --- /dev/null +++ b/examples/debug_assert/CMakeLists.txt @@ -0,0 +1,20 @@ +# Copyright (c) 2016 Alexey Ulyanov +# All rights reserved. + +cmake_minimum_required(VERSION 3.0.2) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-debug_assert) +set(CMAKE_CXX_STANDARD 11) + +hunter_add_package(debug_assert) + +find_package(debug_assert CONFIG REQUIRED) + +set(SOURCES main.cpp) + +add_executable(debug_assert_example ${SOURCES}) +target_link_libraries(debug_assert_example PUBLIC debug_assert) diff --git a/examples/debug_assert/main.cpp b/examples/debug_assert/main.cpp new file mode 100644 index 0000000000..882bb3e064 --- /dev/null +++ b/examples/debug_assert/main.cpp @@ -0,0 +1,68 @@ +#include "debug_assert.hpp" + +#include +#include + +//=== module A ===// +#define MODULE_A_LEVEL 1 // macro to control assertion level +// usually set by the build system + +// tag type that defines a module +struct module_a +: debug_assert::default_handler, // it uses the default handler + debug_assert::set_level // and this level +{}; + +void module_a_func(void* ptr) +{ + DEBUG_ASSERT(ptr, module_a{}); // minimal assertion + DEBUG_ASSERT(2 + 2 == 4, module_a{}, debug_assert::level<2>{}); // assertion with level + DEBUG_ASSERT(1 == 0, module_a{}, "this should be true"); // assertion with additional parameters, i.e. a message + DEBUG_UNREACHABLE(module_a{}); // mark unreachable statements +} + +//=== module B ===// +#define MODULE_B_LEVEL 2 + +struct module_b +: debug_assert::set_level// b uses all assertions with level <= 2 +{ + // module b uses a different handler + // it does not support a message + // instead you can specify a pointer value + static void handle(const debug_assert::source_location& loc, const char* expression, void* ptr = nullptr) + { + std::cerr << "Assertion failure '" << loc.file_name << ':' << loc.line_number << ": " << expression; + if (ptr) + std::cerr << " - pointer is " << ptr; + std::cerr << '\n'; + } +}; + +void module_b_func(int &value, void* ptr) +{ + DEBUG_ASSERT(ptr == &value, module_b{}, ptr); // uses the additional custom parameter + DEBUG_ASSERT(ptr == &value, module_b{}, debug_assert::level<2>{}, ptr); // also works with a custom level +} + +int main() +{ + auto old_handler = std::signal(SIGABRT, [](int signal) + { + if(signal == SIGABRT) + { + std::cerr << "Please never call std::abort() in production :)"; + std::exit(EXIT_SUCCESS); + } + }); + + if(old_handler == SIG_ERR) + { + std::cerr << "Error settings custom SIGABRT handler"; + return EXIT_FAILURE; + } + + module_a_func(nullptr); + int val = 5; + module_b_func(val, &val); +} \ No newline at end of file From fd718c32abb8b09f838b9f8194ebeebfd5911cca Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Mon, 30 Oct 2017 12:49:42 -0400 Subject: [PATCH 0090/1014] Fix options in hunter_dump_cmake_flags --- cmake/modules/hunter_dump_cmake_flags.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/hunter_dump_cmake_flags.cmake b/cmake/modules/hunter_dump_cmake_flags.cmake index 46e7eb3898..3bb5130e4e 100644 --- a/cmake/modules/hunter_dump_cmake_flags.cmake +++ b/cmake/modules/hunter_dump_cmake_flags.cmake @@ -12,7 +12,7 @@ include(hunter_test_string_not_empty) # * OpenSSL # * odb-boost function(hunter_dump_cmake_flags) - cmake_parse_arguments(x "SKIP_INCLUDES" "SKIP_PIC" "CPPFLAGS" "" "${ARGV}") + cmake_parse_arguments(x "SKIP_INCLUDES;SKIP_PIC" "CPPFLAGS" "" "${ARGV}") # -> x_SKIP_INCLUDES # -> x_SKIP_PIC # -> x_CPPFLAGS From bfb056364ef79f84783c0e1b27497be5678e499f Mon Sep 17 00:00:00 2001 From: dvirtz Date: Mon, 30 Oct 2017 19:20:17 +0200 Subject: [PATCH 0091/1014] update debug_assert to 1.3 --- cmake/configs/default.cmake | 2 +- cmake/projects/debug_assert/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 2ebb4889f7..9010ea4ee0 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -156,7 +156,7 @@ hunter_config(czmq VERSION 4.0.2-p1) hunter_config(c-ares VERSION 1.13.0) hunter_config(damageproto VERSION 1.2.1) hunter_config(dbus VERSION 1.10.0-hunter-4) -hunter_config(debug_assert VERSION 1.2) +hunter_config(debug_assert VERSION 1.3) hunter_config(dest VERSION 0.8.0-p4) hunter_config(dlib VERSION 19.6-p1) hunter_config(doctest VERSION 1.2.0) diff --git a/cmake/projects/debug_assert/hunter.cmake b/cmake/projects/debug_assert/hunter.cmake index 19defec27c..83c9b1a34a 100644 --- a/cmake/projects/debug_assert/hunter.cmake +++ b/cmake/projects/debug_assert/hunter.cmake @@ -9,6 +9,17 @@ include(hunter_pick_scheme) include(hunter_cacheable) # List of versions here... +hunter_add_version( + PACKAGE_NAME + debug_assert + VERSION + "1.3" + URL + "https://github.com/foonathan/debug_assert/archive/v1.3.tar.gz" + SHA1 + 0dd6930196488741ebb79680b261694a8141bf9c +) + hunter_add_version( PACKAGE_NAME debug_assert From 57c57d2cb27376175b9bfce4a3afedbbc0751d94 Mon Sep 17 00:00:00 2001 From: Knitschi Date: Tue, 31 Oct 2017 16:55:11 +0100 Subject: [PATCH 0092/1014] Add latest GTest release. --- cmake/configs/default.cmake | 2 +- cmake/projects/GTest/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 9010ea4ee0..53cff0e52d 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -286,7 +286,7 @@ hunter_config(yaml-cpp VERSION 0.5.3-plus-p0) if(MSVC80) hunter_config(GTest VERSION 1.7.0-hunter-6) else() - hunter_config(GTest VERSION 1.8.0-hunter-p8) + hunter_config(GTest VERSION 1.8.0-hunter-p9) endif() if(ANDROID) diff --git a/cmake/projects/GTest/hunter.cmake b/cmake/projects/GTest/hunter.cmake index 7603f08cf7..fe5b295883 100644 --- a/cmake/projects/GTest/hunter.cmake +++ b/cmake/projects/GTest/hunter.cmake @@ -194,6 +194,17 @@ hunter_add_version( 1cdd396b20c8d29f7ea08baaa49673b1c261f545 ) +hunter_add_version( + PACKAGE_NAME + GTest + VERSION + 1.8.0-hunter-p9 + URL + "https://github.com/hunter-packages/googletest/archive/1.8.0-hunter-p9.tar.gz" + SHA1 + a345f16cb610e0b5dfa7778dc2852b784cfede5b +) + if(HUNTER_GTest_VERSION VERSION_LESS 1.8.0) set(_gtest_license "LICENSE") else() From 47f21ee39821cbc707fa8762602b58c6ecf17ccd Mon Sep 17 00:00:00 2001 From: isaachier Date: Tue, 31 Oct 2017 13:48:35 -0400 Subject: [PATCH 0093/1014] Add pybind11 package (#1140) --- cmake/configs/default.cmake | 1 + cmake/projects/pybind11/hunter.cmake | 19 +++++++++++++++++++ docs/packages/pkg/pybind11.rst | 21 +++++++++++++++++++++ docs/packages/scripting.rst | 7 +++++++ examples/pybind11/CMakeLists.txt | 12 ++++++++++++ examples/pybind11/main.cpp | 6 ++++++ 6 files changed, 66 insertions(+) create mode 100644 cmake/projects/pybind11/hunter.cmake create mode 100644 docs/packages/pkg/pybind11.rst create mode 100644 examples/pybind11/CMakeLists.txt create mode 100644 examples/pybind11/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 9010ea4ee0..2de2b86e6d 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -238,6 +238,7 @@ hunter_config(polyclipping VERSION 4.8.8-p0) # for Assimp hunter_config(presentproto VERSION 1.0) hunter_config(pthread-stubs VERSION 0.3) hunter_config(pugixml VERSION 1.8.1) +hunter_config(pybind11 VERSION 2.2.1) hunter_config(rabbitmq-c VERSION 0.7.0-p1) hunter_config(randrproto VERSION 1.3.2) hunter_config(renderproto VERSION 0.11.1) diff --git a/cmake/projects/pybind11/hunter.cmake b/cmake/projects/pybind11/hunter.cmake new file mode 100644 index 0000000000..3388313234 --- /dev/null +++ b/cmake/projects/pybind11/hunter.cmake @@ -0,0 +1,19 @@ +# !!! 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 pybind11 + VERSION "2.2.1" + URL "https://github.com/pybind/pybind11/archive/v2.2.1.tar.gz" + SHA1 "a2bfabe5ae736c3fc3408b5401a656c1f584b511") + +hunter_cmake_args(pybind11 CMAKE_ARGS PYBIND11_TEST=OFF) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(pybind11) +hunter_download(PACKAGE_NAME pybind11) diff --git a/docs/packages/pkg/pybind11.rst b/docs/packages/pkg/pybind11.rst new file mode 100644 index 0000000000..839477a7cf --- /dev/null +++ b/docs/packages/pkg/pybind11.rst @@ -0,0 +1,21 @@ +.. spelling:: + + pybind + pybind11 + +.. index:: scripting ; pybind11 + +.. _pkg.pybind11: + +pybind11 +======== + +- `Official `__ +- `Example `__ +- Added by `Isaac Hier `__ (`pr-1140 `__) + +.. code-block:: cmake + + hunter_add_package(pybind11) + find_package(pybind11 CONFIG REQUIRED) + target_link_libraries(... pybind11::pybind11 pybind11::embed pybind11::module) diff --git a/docs/packages/scripting.rst b/docs/packages/scripting.rst index 1909582a55..8cbc5b093c 100644 --- a/docs/packages/scripting.rst +++ b/docs/packages/scripting.rst @@ -1,5 +1,12 @@ +.. spelling:: + + pybind + pybind11 + versa + Scripting --------- - :ref:`pkg.Lua` - powerful, efficient, lightweight, embeddable scripting language. + - :ref:`pkg.pybind11` - a lightweight header-only library that exposes C++ types in Python and vice versa. diff --git a/examples/pybind11/CMakeLists.txt b/examples/pybind11/CMakeLists.txt new file mode 100644 index 0000000000..27789941a7 --- /dev/null +++ b/examples/pybind11/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.1) + +include("../common.cmake") + +project(download-pybind11) + +hunter_add_package(pybind11) + +find_package(pybind11 CONFIG REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main pybind11::pybind11 pybind11::embed pybind11::module) diff --git a/examples/pybind11/main.cpp b/examples/pybind11/main.cpp new file mode 100644 index 0000000000..2578341b9b --- /dev/null +++ b/examples/pybind11/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + return 0; +} From 9493a90f8f9ab4b4c81aa149cefbc1008f16589a Mon Sep 17 00:00:00 2001 From: dvirtz Date: Wed, 1 Nov 2017 11:29:03 +0200 Subject: [PATCH 0094/1014] added type_safe (#1143) --- cmake/configs/default.cmake | 1 + cmake/projects/type_safe/hunter.cmake | 26 ++++++ docs/packages/pkg/type_safe.rst | 21 +++++ examples/type_safe/CMakeLists.txt | 19 ++++ examples/type_safe/main.cpp | 125 ++++++++++++++++++++++++++ 5 files changed, 192 insertions(+) create mode 100644 cmake/projects/type_safe/hunter.cmake create mode 100644 docs/packages/pkg/type_safe.rst create mode 100644 examples/type_safe/CMakeLists.txt create mode 100644 examples/type_safe/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 3e28f8bbfe..926a416aaf 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -257,6 +257,7 @@ hunter_config(Tesseract VERSION 3.05.01-hunter-3) hunter_config(thread-pool-cpp VERSION 1.1.0) hunter_config(thrift VERSION 0.10.0-p1) hunter_config(tinydir VERSION 1.2-p0) +hunter_config(type_safe VERSION 0.1) hunter_config(util_linux VERSION 2.30.1) hunter_config(websocketpp VERSION 0.7.0-p2) hunter_config(wxWidgets VERSION 3.0.2) diff --git a/cmake/projects/type_safe/hunter.cmake b/cmake/projects/type_safe/hunter.cmake new file mode 100644 index 0000000000..bc75380934 --- /dev/null +++ b/cmake/projects/type_safe/hunter.cmake @@ -0,0 +1,26 @@ +# cmake/projects/Example/hunter.cmake + +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +# Load used modules +include(hunter_add_version) +include(hunter_download) +include(hunter_pick_scheme) +include(hunter_cacheable) + +# List of versions here... +hunter_add_version( + PACKAGE_NAME + type_safe + VERSION + "0.1" + URL + "https://github.com/hunter-packages/type_safe/archive/v0.1-p.tar.gz" + SHA1 + 57e426af70791485e2a209c602ce9d71e9d52ab7 +) + +# Pick a download scheme +hunter_pick_scheme(DEFAULT url_sha1_cmake) # use scheme for cmake projects +hunter_cacheable(type_safe) +hunter_download(PACKAGE_NAME type_safe) diff --git a/docs/packages/pkg/type_safe.rst b/docs/packages/pkg/type_safe.rst new file mode 100644 index 0000000000..f4763ef224 --- /dev/null +++ b/docs/packages/pkg/type_safe.rst @@ -0,0 +1,21 @@ +.. spelling:: + + type_safe + +.. index:: unsorted ; type_safe + +.. _pkg.type_safe: + +type_safe +============ + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `dvirtz `__ (`pr-1143 `__) + +.. code-block:: cmake + + hunter_add_package(type_safe) + find_package(type_safe CONFIG REQUIRED) + target_link_libraries(type_safe_example type_safe) diff --git a/examples/type_safe/CMakeLists.txt b/examples/type_safe/CMakeLists.txt new file mode 100644 index 0000000000..c8c5277a23 --- /dev/null +++ b/examples/type_safe/CMakeLists.txt @@ -0,0 +1,19 @@ +# Copyright (c) 2016 Alexey Ulyanov +# All rights reserved. + +cmake_minimum_required(VERSION 3.0.2) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-type_safe) +set(CMAKE_CXX_STANDARD 11) + +hunter_add_package(type_safe) +find_package(type_safe CONFIG REQUIRED) + +set(SOURCES main.cpp) + +add_executable(type_safe_example ${SOURCES}) +target_link_libraries(type_safe_example type_safe) diff --git a/examples/type_safe/main.cpp b/examples/type_safe/main.cpp new file mode 100644 index 0000000000..6f2e3f3137 --- /dev/null +++ b/examples/type_safe/main.cpp @@ -0,0 +1,125 @@ +// Copyright (C) 2016-2017 Jonathan Müller +// This file is subject to the license terms in the LICENSE file +// found in the top-level directory of this distribution. + +#include +#include +#include + +#include +#include +#include + +namespace ts = type_safe; + +// type safe back function +// impossible to forget precondition +ts::optional back(const std::string& str) +{ + return str.empty() ? ts::nullopt : ts::make_optional(str.back()); +} + +// some imaginary lookup function +ts::optional lookup(int c) +{ + // simulate lookup + return c == 'T' ? ts::nullopt : ts::make_optional(c + 1); +} + +// task: get last character of string, +// convert it to upper case +// look it up +// and return the integer or 0 if there is no integer + +// this is how'd you do it with std::optional +int task_std(const std::string& str) +{ + auto c = back(str); + if (!c) + return 0; + auto upper_case = std::toupper(c.value()); + auto result = lookup(upper_case); + return result.value_or(0); +} + +// this is how'd you do it with the monadic functionality +// there is no need for branches and no errors possible +// it generates identical assembler code +int task_monadic(const std::string& str) +{ + return back(str) + // map takes a functor and applies it to the stored value, if there is any + // the result is another optional with possibly different type + .map(static_cast(&std::toupper)) + // now we map lookup + // as lookup returns already an optional itself, + // it won't wrap the result in another optional + .map(lookup) + // value_or() as usual + .value_or(0); +} + +// a visitor for an optional +// this again makes branches unnecessary +struct visitor +{ + template + void operator()(const T& val) + { + std::cout << val << '\n'; + } + + void operator()(ts::nullopt_t) + { + std::cout << "nothing :(\n"; + } +}; + +int main() +{ + std::cout << task_std("Hello World") << ' ' << task_monadic("Hello World") << '\n'; + std::cout << task_std("Hallo Welt") << ' ' << task_monadic("Hallo Welt") << '\n'; + std::cout << task_std("") << ' ' << task_monadic("") << '\n'; + + // visit an optional + ts::optional opt(45); + ts::visit(visitor{}, opt); + opt.reset(); + ts::visit(visitor{}, opt); + + // savely manipulate the value if there is one + // with() is an inplace map() + // and thus more efficient if you do not need to change the type + ts::with(opt, [](int& i) { + std::cout << "got: " << i << '\n'; + ++i; + }); + + // an optional reference + // basically a pointer, but provides the funcionality of optional + ts::optional_ref ref; + + int a = 42; + ref = ts::ref(a); // assignment rebinds + std::cout << ref.value() << '\n'; + + ref.value() = 0; + std::cout << a << '\n'; + + int b = 5; + ref.value_or(b)++; + std::cout << a << ' ' << b << '\n'; + + ref = nullptr; // assign nullptr as additional way to reset + + // an optional reference to const + ts::optional_ref ref_const(ref); + + // create optional_ref from pointer + auto ptr = ts::opt_ref(&a); + auto ptr_const = ts::opt_cref(&a); + + /// transform an optional_ref to an optional by copying + auto ptr_transformed = ts::copy(ptr); // there is also ts::move() to move the value + std::cout << ptr_transformed.value() << '\n'; +} \ No newline at end of file From 80954c867a88e7a7d58d542ede2b9e3fda2ac2a0 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Wed, 1 Nov 2017 12:47:25 +0300 Subject: [PATCH 0095/1014] Docs: Link to Boost issue --- docs/packages/pkg/Boost.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/packages/pkg/Boost.rst b/docs/packages/pkg/Boost.rst index 35d2aa3807..9f07ccb96e 100644 --- a/docs/packages/pkg/Boost.rst +++ b/docs/packages/pkg/Boost.rst @@ -127,6 +127,7 @@ Bugs - `boost mingw `__ - `arm64 unknown `__ - workaround: set additional ``armv7``, i.e. when ``arm64`` build alone - result will be universal library ``armv7`` + ``arm64`` +- `VSCMD_START_DIR issue `__ CI -- From 0dc4bb5f608e6a72861a7d5812c3b7e9230ff97c Mon Sep 17 00:00:00 2001 From: Knitschi Date: Wed, 1 Nov 2017 10:51:44 +0100 Subject: [PATCH 0096/1014] =?UTF-8?q?Mention=20possible=20problems=20with?= =?UTF-8?q?=20HUNTER=5F=5FVERSION=20in=20the=20GIT=5FSU=E2=80=A6?= =?UTF-8?q?=20(#1141)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/user-guides/hunter-user/git-submodule.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/user-guides/hunter-user/git-submodule.rst b/docs/user-guides/hunter-user/git-submodule.rst index c1da893e6c..6f1518fa36 100644 --- a/docs/user-guides/hunter-user/git-submodule.rst +++ b/docs/user-guides/hunter-user/git-submodule.rst @@ -108,6 +108,14 @@ Run tests to see changes: 1: plum-v2 x 2 1: pear x 1 +Possible problems with GIT_SUBMODULE +==================================== + +When using a package via the ``GIT_SUBMODULE`` option, the Hunter defined CMake variable ``HUNTER__VERSION`` +is set to the commit hash of the Git sub-module. If the ``hunter.cmake`` file of the package +contains logic that depends on the value of the ``HUNTER__VERSION`` variable, +using the ``GIT_SUBMODULE`` option may break the package build. + Use subdirectory of submodule ============================= From 5fe41a243259cde45cbaa73173d279dbb4b93b62 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Sat, 4 Nov 2017 14:16:43 -0400 Subject: [PATCH 0097/1014] add gemmlowp + test * header only interface * needs C++11 --- cmake/configs/default.cmake | 1 + cmake/projects/gemmlowp/hunter.cmake | 26 ++++++++++++++++++++++++++ examples/gemmlowp/CMakeLists.txt | 17 +++++++++++++++++ examples/gemmlowp/foo.cpp | 4 ++++ 4 files changed, 48 insertions(+) create mode 100644 cmake/projects/gemmlowp/hunter.cmake create mode 100644 examples/gemmlowp/CMakeLists.txt create mode 100644 examples/gemmlowp/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 926a416aaf..8a82839421 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -176,6 +176,7 @@ hunter_config(flex VERSION 2.6.4) hunter_config(fmt VERSION 4.0.0) hunter_config(freetype VERSION 2.6.2) hunter_config(gauze VERSION 0.1.2) +hunter_config(gemmlowp VERSION 1.0.0) hunter_config(geos VERSION 3.4.2) hunter_config(gflags VERSION 2.2.1) hunter_config(glbinding VERSION 2.1.3-p0) diff --git a/cmake/projects/gemmlowp/hunter.cmake b/cmake/projects/gemmlowp/hunter.cmake new file mode 100644 index 0000000000..32171006b2 --- /dev/null +++ b/cmake/projects/gemmlowp/hunter.cmake @@ -0,0 +1,26 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# 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 + gemmlowp + VERSION + 1.0.0 + URL + "https://github.com/hunter-packages/gemmlowp/archive/v1.0.0.tar.gz" + SHA1 + 2da3f6f97b9e3368a3afd5d002334248b79cf6c3 + ) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(gemmlowp) +hunter_download(PACKAGE_NAME gemmlowp) diff --git a/examples/gemmlowp/CMakeLists.txt b/examples/gemmlowp/CMakeLists.txt new file mode 100644 index 0000000000..26a7019e6e --- /dev/null +++ b/examples/gemmlowp/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-gemmlowp) + +hunter_add_package(gemmlowp) +find_package(gemmlowp CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo gemmlowp::gemmlowp) diff --git a/examples/gemmlowp/foo.cpp b/examples/gemmlowp/foo.cpp new file mode 100644 index 0000000000..9a11d797ac --- /dev/null +++ b/examples/gemmlowp/foo.cpp @@ -0,0 +1,4 @@ +#include + +int main() { +} From d8b9e0c3f174947bb6fa16917f8a8a57f79c4099 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Sat, 4 Nov 2017 18:04:57 -0400 Subject: [PATCH 0098/1014] add farmhash + test --- cmake/configs/default.cmake | 1 + cmake/projects/farmhash/hunter.cmake | 26 ++++++++++++++++++++++++++ examples/farmhash/CMakeLists.txt | 17 +++++++++++++++++ examples/farmhash/foo.cpp | 4 ++++ 4 files changed, 48 insertions(+) create mode 100644 cmake/projects/farmhash/hunter.cmake create mode 100644 examples/farmhash/CMakeLists.txt create mode 100644 examples/farmhash/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 926a416aaf..f54ae54de9 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -170,6 +170,7 @@ hunter_config(drm VERSION 2.4.67) hunter_config(eigen3-nnls VERSION 1.0.1) hunter_config(eos VERSION 0.12.1) hunter_config(FakeIt VERSION 2.0.3) +hunter_config(farmhash VERSION 1.1) hunter_config(fixesproto VERSION 5.0) hunter_config(flatbuffers VERSION 1.3.0-p3) hunter_config(flex VERSION 2.6.4) diff --git a/cmake/projects/farmhash/hunter.cmake b/cmake/projects/farmhash/hunter.cmake new file mode 100644 index 0000000000..a53ba2dc21 --- /dev/null +++ b/cmake/projects/farmhash/hunter.cmake @@ -0,0 +1,26 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# 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 + farmhash + VERSION + 1.1 + URL + https://github.com/hunter-packages/farmhash/archive/v1.1.tar.gz + SHA1 + d2f911dc4fa72af2a6ff82c2ca372c7b0f05493d + ) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(farmhash) +hunter_download(PACKAGE_NAME farmhash) diff --git a/examples/farmhash/CMakeLists.txt b/examples/farmhash/CMakeLists.txt new file mode 100644 index 0000000000..4ef57e651c --- /dev/null +++ b/examples/farmhash/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-farmhash) + +hunter_add_package(farmhash) +find_package(farmhash CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo farmhash::farmhash) diff --git a/examples/farmhash/foo.cpp b/examples/farmhash/foo.cpp new file mode 100644 index 0000000000..a88950d57f --- /dev/null +++ b/examples/farmhash/foo.cpp @@ -0,0 +1,4 @@ +#include + +int main() { +} From 0759863b0164280d9e81b67ffc1b2d9b276e9000 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Sun, 5 Nov 2017 11:25:22 -0500 Subject: [PATCH 0099/1014] add highwayhash --- cmake/configs/default.cmake | 1 + cmake/projects/highwayhash/hunter.cmake | 26 +++++++++++++++++++++++++ examples/highwayhash/CMakeLists.txt | 17 ++++++++++++++++ examples/highwayhash/foo.cpp | 12 ++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 cmake/projects/highwayhash/hunter.cmake create mode 100644 examples/highwayhash/CMakeLists.txt create mode 100644 examples/highwayhash/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 926a416aaf..bb2f40c79f 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -195,6 +195,7 @@ hunter_config(gstreamer VERSION 1.10.4) hunter_config(gumbo VERSION 0.10.1) hunter_config(half VERSION 1.1.0-p1) hunter_config(hdf5 VERSION 1.8.15-p1) +hunter_config(highwayhash VERSION 0.0.0) hunter_config(ice VERSION 1.0.8) hunter_config(imshow VERSION 1.0.0-p0) hunter_config(inputproto VERSION 2.2) diff --git a/cmake/projects/highwayhash/hunter.cmake b/cmake/projects/highwayhash/hunter.cmake new file mode 100644 index 0000000000..6f5e645cd0 --- /dev/null +++ b/cmake/projects/highwayhash/hunter.cmake @@ -0,0 +1,26 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# 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 + highwayhash + VERSION + 0.0.0 + URL + "https://github.com/hunter-packages/highwayhash/archive/v0.0.0.tar.gz" + SHA1 + d62b32d5c8b6e63f6d4f8e72cfb495572b4f5386 + ) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(highwayhash) +hunter_download(PACKAGE_NAME highwayhash) diff --git a/examples/highwayhash/CMakeLists.txt b/examples/highwayhash/CMakeLists.txt new file mode 100644 index 0000000000..755cd5d4ea --- /dev/null +++ b/examples/highwayhash/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-highwayhash) + +hunter_add_package(highwayhash) +find_package(highwayhash CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo highwayhash::highwayhash) diff --git a/examples/highwayhash/foo.cpp b/examples/highwayhash/foo.cpp new file mode 100644 index 0000000000..8f43a55285 --- /dev/null +++ b/examples/highwayhash/foo.cpp @@ -0,0 +1,12 @@ +#include "highwayhash/sip_hash.h" +#include "highwayhash/state_helpers.h" +#include + +// Mimic single use in tensorflow/tensorflow//core/platform/default/strong_hash.h +inline std::uint64_t StrongKeyedHash(const std::uint64_t (&key)[2], const std::string& s) { + return highwayhash::StringHasher()(key, s); +} + +int main() { + return 0; +} From f8f3d92632250e6c72437fd59c972023fcde390b Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Mon, 6 Nov 2017 11:15:28 +0100 Subject: [PATCH 0100/1014] docs: fix link to example of hdf5 --- docs/packages/pkg/hdf5.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/hdf5.rst b/docs/packages/pkg/hdf5.rst index 24f23ec6b0..a2743ee25f 100644 --- a/docs/packages/pkg/hdf5.rst +++ b/docs/packages/pkg/hdf5.rst @@ -10,7 +10,7 @@ hdf5 ==== - `Hunterized `__ -- `Example `__ +- `Example `__ .. code-block:: cmake From e786bed102db2e1d53f598da5fe17a7e4d06e6e5 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Wed, 8 Nov 2017 22:38:20 -0500 Subject: [PATCH 0101/1014] add acf + test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit C++ implementation of Aggregated Channel Features for fast object detection (from Piotr Dollar’s matlab toolbox) with optional OpengL ES 2.0 shader optimizations. dependency notes: * opencv: long build times, use server cache hits * cvmatio: loads *.mat models directly from Piotr’s toolbox * ogles_gpgpu: GPU optimations disabled by default, interface will changesy * sse2neon: enable SIMD optimization on ARM platforms --- cmake/configs/default.cmake | 1 + cmake/projects/acf/hunter.cmake | 34 +++++++++++++++++++++++++++++++++ examples/acf/CMakeLists.txt | 17 +++++++++++++++++ examples/acf/foo.cpp | 5 +++++ 4 files changed, 57 insertions(+) create mode 100644 cmake/projects/acf/hunter.cmake create mode 100644 examples/acf/CMakeLists.txt create mode 100644 examples/acf/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 926a416aaf..7a90ce7933 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -136,6 +136,7 @@ hunter_config(ZMQPP VERSION 4.1.2) hunter_config(ZeroMQ VERSION 4.2.3-p1) hunter_config(caffe VERSION rc3-p2) hunter_config(Catch VERSION 1.8.2-p0) +hunter_config(acf VERSION 0.0.1) hunter_config(aes VERSION 0.0.1-p1) hunter_config(aglet VERSION 1.2.0) hunter_config(autobahn-cpp VERSION 0.2.0) diff --git a/cmake/projects/acf/hunter.cmake b/cmake/projects/acf/hunter.cmake new file mode 100644 index 0000000000..25a7ff4f7a --- /dev/null +++ b/cmake/projects/acf/hunter.cmake @@ -0,0 +1,34 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# 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 + acf + VERSION + 0.0.1 + URL + "https://github.com/elucideye/acf/archive/v0.0.1.tar.gz" + SHA1 + 985bd3005b14120625e3684a8596d499bfc23a48 + ) + +hunter_cmake_args(acf CMAKE_ARGS + ACF_BUILD_OGLES_GPGPU=OFF # optional opengl shaders off + ACF_USE_DRISHTI_CACHE=OFF # use hunter cache + ACF_BUILD_EXAMPLES=OFF + ACF_BUILD_TESTS=OFF + ) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(acf) +hunter_download(PACKAGE_NAME acf) + diff --git a/examples/acf/CMakeLists.txt b/examples/acf/CMakeLists.txt new file mode 100644 index 0000000000..0e6eb31fdc --- /dev/null +++ b/examples/acf/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-acf) + +hunter_add_package(acf) +find_package(acf CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo acf::acf) diff --git a/examples/acf/foo.cpp b/examples/acf/foo.cpp new file mode 100644 index 0000000000..731880d12e --- /dev/null +++ b/examples/acf/foo.cpp @@ -0,0 +1,5 @@ +#include + +int main() { + acf::Detector("just_a_test"); +} From 75afdbdbc3b95b6fd19b2889e22883590bc5179b Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Thu, 9 Nov 2017 14:32:29 +0300 Subject: [PATCH 0102/1014] OpenSSL 1.1.0g --- cmake/configs/default.cmake | 2 +- cmake/projects/OpenSSL/hunter.cmake | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 926a416aaf..83b3a1668e 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -96,7 +96,7 @@ hunter_config(OpenCL-cpp VERSION 2.0.10-p0) hunter_config(OpenCV VERSION 3.3.0-p2) hunter_config(OpenCV-Extra VERSION 3.3.0) hunter_config(OpenNMTTokenizer VERSION 0.2.0-p1) -hunter_config(OpenSSL VERSION 1.1.0f) +hunter_config(OpenSSL VERSION 1.1.0g) hunter_config(PNG VERSION 1.6.26-p1) hunter_config(PocoCpp VERSION 1.7.9-p0) hunter_config(PostgreSQL VERSION 10.0.0) diff --git a/cmake/projects/OpenSSL/hunter.cmake b/cmake/projects/OpenSSL/hunter.cmake index f0a59f2db5..a0354dd112 100755 --- a/cmake/projects/OpenSSL/hunter.cmake +++ b/cmake/projects/OpenSSL/hunter.cmake @@ -65,6 +65,17 @@ hunter_add_version( 8fd0ba4c9bb98a1d380689704b132fe20c000a19 ) +hunter_add_version( + PACKAGE_NAME + OpenSSL + VERSION + "1.1.0g" + URL + "https://github.com/openssl/openssl/archive/OpenSSL_1_1_0g.tar.gz" + SHA1 + 07a8861dfb51d3ba983668f0f8daeac49bf3dbc3 +) + hunter_add_version( PACKAGE_NAME OpenSSL @@ -164,6 +175,17 @@ hunter_add_version( a233de65e91dc176f4e34be03899ae00eb1dd029 ) +hunter_add_version( + PACKAGE_NAME + OpenSSL + VERSION + "1.0.2m" + URL + "https://github.com/openssl/openssl/archive/OpenSSL_1_0_2m.tar.gz" + SHA1 + f0af7e246a677fd52945e5438eb11ce0de391a4c +) + hunter_add_version( PACKAGE_NAME OpenSSL From 76d1004e88eb67572eed932f9f6fc1a5475ca604 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 10 Nov 2017 10:35:19 +0300 Subject: [PATCH 0103/1014] Docs: Add 'acf' --- docs/packages/computer-vision.rst | 1 + docs/packages/pkg/acf.rst | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 docs/packages/pkg/acf.rst diff --git a/docs/packages/computer-vision.rst b/docs/packages/computer-vision.rst index 909e4dfb2f..de47541033 100644 --- a/docs/packages/computer-vision.rst +++ b/docs/packages/computer-vision.rst @@ -6,6 +6,7 @@ Computer Vision --------------- + - :ref:`pkg.acf` - Aggregated Channel Feature object detection in C++ and OpenGL ES 2.0. - :ref:`pkg.caffe` - fast open framework for deep learning. - :ref:`pkg.ccv` - A Modern Computer Vision Library - :ref:`pkg.cvmatio` - Matlab Mat file read and write C++ class with OpenCV bindings. diff --git a/docs/packages/pkg/acf.rst b/docs/packages/pkg/acf.rst new file mode 100644 index 0000000000..5718576b69 --- /dev/null +++ b/docs/packages/pkg/acf.rst @@ -0,0 +1,20 @@ +.. spelling:: + + acf + +.. index:: computer-vision ; acf + +.. _pkg.acf: + +acf +=== + +- `Official `__ +- `Example `__ +- Added by `David Hirvonen `__ (`pr-1176 `__) + +.. code-block:: cmake + + hunter_add_package(acf) + find_package(acf CONFIG REQUIRED) + target_link_libraries(acf acf::acf) From fe5fd2c6392be1862bfea486dddce48ca3cd5760 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 10 Nov 2017 10:45:29 +0300 Subject: [PATCH 0104/1014] Docs: Sort 'math' --- docs/packages/math.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/packages/math.rst b/docs/packages/math.rst index d6e328c9ad..3479302358 100644 --- a/docs/packages/math.rst +++ b/docs/packages/math.rst @@ -6,11 +6,11 @@ Math ---- - :ref:`pkg.CLAPACK` - - :ref:`pkg.double-conversion` - provides binary-decimal and decimal-binary routines for IEEE doubles. - :ref:`pkg.Eigen` - C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms. - - :ref:`pkg.glm` - header only C++ mathematics library for graphics software based on the OpenGL Shading Language (GLSL) specifications. - :ref:`pkg.GSL` - GNU Scientific Library - - :ref:`pkg.half` - Half-precision floating point library - :ref:`pkg.OpenBLAS` - OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version + - :ref:`pkg.double-conversion` - provides binary-decimal and decimal-binary routines for IEEE doubles. + - :ref:`pkg.glm` - header only C++ mathematics library for graphics software based on the OpenGL Shading Language (GLSL) specifications. + - :ref:`pkg.half` - Half-precision floating point library - :ref:`pkg.poly2tri` - 2D constrained Delaunay triangulation library - :ref:`pkg.polyclipping` - Polygon and line clipping and offsetting library From 8df5394679af3c1461b3492c10e07c6497ee5322 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 10 Nov 2017 10:56:07 +0300 Subject: [PATCH 0105/1014] Docs: Add 'gemmlowp' --- docs/packages/math.rst | 1 + docs/packages/pkg/gemmlowp.rst | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 docs/packages/pkg/gemmlowp.rst diff --git a/docs/packages/math.rst b/docs/packages/math.rst index 3479302358..0887f55ebd 100644 --- a/docs/packages/math.rst +++ b/docs/packages/math.rst @@ -10,6 +10,7 @@ Math - :ref:`pkg.GSL` - GNU Scientific Library - :ref:`pkg.OpenBLAS` - OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version - :ref:`pkg.double-conversion` - provides binary-decimal and decimal-binary routines for IEEE doubles. + - :ref:`pkg.gemmlowp` - Low-precision matrix multiplication. - :ref:`pkg.glm` - header only C++ mathematics library for graphics software based on the OpenGL Shading Language (GLSL) specifications. - :ref:`pkg.half` - Half-precision floating point library - :ref:`pkg.poly2tri` - 2D constrained Delaunay triangulation library diff --git a/docs/packages/pkg/gemmlowp.rst b/docs/packages/pkg/gemmlowp.rst new file mode 100644 index 0000000000..98b7b24ce4 --- /dev/null +++ b/docs/packages/pkg/gemmlowp.rst @@ -0,0 +1,21 @@ +.. spelling:: + + gemmlowp + +.. index:: math ; gemmlowp + +.. _pkg.gemmlowp: + +gemmlowp +======== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `David Hirvonen `__ (`pr-1149 `__) + +.. code-block:: cmake + + hunter_add_package(gemmlowp) + find_package(gemmlowp CONFIG REQUIRED) + target_link_libraries(gemmlowp gemmlowp::gemmlowp) From e88fbcd704299f3a7d1a878996dab4b144b8f0d8 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 10 Nov 2017 11:03:45 +0300 Subject: [PATCH 0106/1014] Docs: Add 'farmhash' --- docs/packages/pkg/farmhash.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 docs/packages/pkg/farmhash.rst diff --git a/docs/packages/pkg/farmhash.rst b/docs/packages/pkg/farmhash.rst new file mode 100644 index 0000000000..9dfce09515 --- /dev/null +++ b/docs/packages/pkg/farmhash.rst @@ -0,0 +1,21 @@ +.. spelling:: + + farmhash + +.. index:: unsorted ; farmhash + +.. _pkg.farmhash: + +farmhash +======== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `David Hirvonen `__ (`pr-1150 `__) + +.. code-block:: cmake + + hunter_add_package(farmhash) + find_package(farmhash CONFIG REQUIRED) + target_link_libraries(farmhash farmhash::farmhash) From 7e5bd266f85d2e42dfce078bc6254a4dfa0a8b1f Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Fri, 10 Nov 2017 03:32:59 -0500 Subject: [PATCH 0107/1014] add giflib + test (#1152) --- cmake/configs/default.cmake | 1 + cmake/projects/giflib/hunter.cmake | 26 ++++++++++++++++++++++++++ examples/giflib/CMakeLists.txt | 17 +++++++++++++++++ examples/giflib/foo.cpp | 4 ++++ 4 files changed, 48 insertions(+) create mode 100644 cmake/projects/giflib/hunter.cmake create mode 100644 examples/giflib/CMakeLists.txt create mode 100644 examples/giflib/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index d8430b323d..7a26cab956 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -180,6 +180,7 @@ hunter_config(freetype VERSION 2.6.2) hunter_config(gauze VERSION 0.1.2) hunter_config(gemmlowp VERSION 1.0.0) hunter_config(geos VERSION 3.4.2) +hunter_config(giflib VERSION 5.1.4-p0) hunter_config(gflags VERSION 2.2.1) hunter_config(glbinding VERSION 2.1.3-p0) hunter_config(glew VERSION 2.0.0) diff --git a/cmake/projects/giflib/hunter.cmake b/cmake/projects/giflib/hunter.cmake new file mode 100644 index 0000000000..67cb6ef1ba --- /dev/null +++ b/cmake/projects/giflib/hunter.cmake @@ -0,0 +1,26 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# 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 + giflib + VERSION + 5.1.4-p0 + URL + "https://github.com/hunter-packages/giflib/archive/v5.1.4-p0.tar.gz" + SHA1 + d93b71a805de3c24316e55164828fe687527a8f4 + ) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(giflib) +hunter_download(PACKAGE_NAME giflib) diff --git a/examples/giflib/CMakeLists.txt b/examples/giflib/CMakeLists.txt new file mode 100644 index 0000000000..7ca42f2d89 --- /dev/null +++ b/examples/giflib/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-giflib) + +hunter_add_package(giflib) +find_package(giflib CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo giflib::giflib) diff --git a/examples/giflib/foo.cpp b/examples/giflib/foo.cpp new file mode 100644 index 0000000000..d85b7732d9 --- /dev/null +++ b/examples/giflib/foo.cpp @@ -0,0 +1,4 @@ +#include + +int main() { +} From 38a255d5b5db1af8d10d558fc10b8e2238263e43 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 10 Nov 2017 11:43:27 +0300 Subject: [PATCH 0108/1014] Docs: Add 'highwayhash' --- docs/packages/pkg/highwayhash.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 docs/packages/pkg/highwayhash.rst diff --git a/docs/packages/pkg/highwayhash.rst b/docs/packages/pkg/highwayhash.rst new file mode 100644 index 0000000000..bfc4b7da08 --- /dev/null +++ b/docs/packages/pkg/highwayhash.rst @@ -0,0 +1,21 @@ +.. spelling:: + + highwayhash + +.. index:: unsorted ; highwayhash + +.. _pkg.highwayhash: + +highwayhash +=========== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `David Hirvonen `__ (`pr-1151 `__) + +.. code-block:: cmake + + hunter_add_package(highwayhash) + find_package(highwayhash CONFIG REQUIRED) + target_link_libraries(highwayhash highwayhash::highwayhash) From 0759ff29aa8ee16ffd9a94e43d268a82df295fff Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Fri, 10 Nov 2017 03:46:49 -0500 Subject: [PATCH 0109/1014] add fft2d + test (#1161) --- cmake/configs/default.cmake | 1 + cmake/projects/fft2d/hunter.cmake | 26 ++++++++++++++ examples/fft2d/CMakeLists.txt | 17 +++++++++ examples/fft2d/foo.cpp | 59 +++++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+) create mode 100644 cmake/projects/fft2d/hunter.cmake create mode 100644 examples/fft2d/CMakeLists.txt create mode 100644 examples/fft2d/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 7a26cab956..0fef80bd80 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -171,6 +171,7 @@ hunter_config(drm VERSION 2.4.67) hunter_config(eigen3-nnls VERSION 1.0.1) hunter_config(eos VERSION 0.12.1) hunter_config(FakeIt VERSION 2.0.3) +hunter_config(fft2d VERSION 1.0.0-p0) hunter_config(farmhash VERSION 1.1) hunter_config(fixesproto VERSION 5.0) hunter_config(flatbuffers VERSION 1.3.0-p3) diff --git a/cmake/projects/fft2d/hunter.cmake b/cmake/projects/fft2d/hunter.cmake new file mode 100644 index 0000000000..3795b5073d --- /dev/null +++ b/cmake/projects/fft2d/hunter.cmake @@ -0,0 +1,26 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# 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 + fft2d + VERSION + 1.0.0-p0 + URL + "https://github.com/hunter-packages/fft2d/archive/v1.0.0-p0.tar.gz" + SHA1 + 080f5415229653fe032e981e4ce65a05a6967bbe + ) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(fft2d) +hunter_download(PACKAGE_NAME fft2d) diff --git a/examples/fft2d/CMakeLists.txt b/examples/fft2d/CMakeLists.txt new file mode 100644 index 0000000000..e4bf80808d --- /dev/null +++ b/examples/fft2d/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-fft2d) + +hunter_add_package(fft2d) +find_package(fft2d CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo fft2d::fft2d) diff --git a/examples/fft2d/foo.cpp b/examples/fft2d/foo.cpp new file mode 100644 index 0000000000..c7551ee0a1 --- /dev/null +++ b/examples/fft2d/foo.cpp @@ -0,0 +1,59 @@ +// Source : fft2d/sample1/testxg.c (open license) +// +// Reproduce samples for valid link test, since no headers are exported. +// +// This is used as a build test only. + +#include +#include +#define MAX(x,y) ((x) > (y) ? (x) : (y)) + +/* random number generator, 0 <= RND < 1 */ +#define RND(p) ((*(p) = (*(p) * 7141 + 54773) % 259200) * (1.0 / 259200.0)) + +#ifndef NMAX +#define NMAX 8192 +#define NMAXSQRT 64 +#endif + +extern "C" { +void cdft(int, int, double *, int *, double *); +void putdata(int nini, int nend, double *a) +{ + int j, seed = 0; + + for (j = nini; j <= nend; j++) { + a[j] = RND(&seed); + } +} +double errorcheck(int nini, int nend, double scale, double *a) +{ + int j, seed = 0; + double err = 0, e; + + for (j = nini; j <= nend; j++) { + e = RND(&seed) - a[j] * scale; + err = MAX(err, fabs(e)); + } + return err; +} + +} // extern "C" + +int main() +{ + int n = 64, ip[NMAXSQRT + 2]; + double a[NMAX + 1], w[NMAX * 5 / 4], t[NMAX / 2 + 1], err; + + printf("data length n=? (must be 2^m)\n"); + //scanf("%d", &n); + ip[0] = 0; + + /* check of CDFT */ + + putdata(0, n - 1, a); + cdft(n, 1, a, ip, w); + cdft(n, -1, a, ip, w); + return errorcheck(0, n - 1, 2.0 / n, a); +} + From 715214296932de8d116db4055f5040963d13fb0f Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 10 Nov 2017 12:56:39 +0300 Subject: [PATCH 0110/1014] Docs: Add 'fft2d' --- docs/packages/pkg/fft2d.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 docs/packages/pkg/fft2d.rst diff --git a/docs/packages/pkg/fft2d.rst b/docs/packages/pkg/fft2d.rst new file mode 100644 index 0000000000..57d7faa903 --- /dev/null +++ b/docs/packages/pkg/fft2d.rst @@ -0,0 +1,21 @@ +.. spelling:: + + fft + +.. index:: math ; fft2d + +.. _pkg.fft2d: + +fft2d +===== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `David Hirvonen `__ (`pr-1161 `__) + +.. code-block:: cmake + + hunter_add_package(fft2d) + find_package(fft2d CONFIG REQUIRED) + target_link_libraries(fft2d fft2d::fft2d) From 460beb841a62c20923e3ab58c504c6466bd5e5ee Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 10 Nov 2017 13:07:17 +0300 Subject: [PATCH 0111/1014] Docs: Sort 'media' --- docs/packages/media.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/packages/media.rst b/docs/packages/media.rst index d02887f75d..cb786094d3 100644 --- a/docs/packages/media.rst +++ b/docs/packages/media.rst @@ -6,8 +6,8 @@ Media ----- - :ref:`pkg.Jpeg` - library for JPEG image compression. - - :ref:`pkg.libyuv` - YUV scaling and conversion functionality. - :ref:`pkg.OpenAL` - software implementation of the OpenAL 3D audio API. - :ref:`pkg.PNG` - library for use in applications that read, create, and manipulate PNG (Portable Network Graphics) raster image files. - - :ref:`pkg.TIFF` - :ref:`pkg.SDL_mixer` - A sample multi-channel audio mixer library for SDL. + - :ref:`pkg.TIFF` + - :ref:`pkg.libyuv` - YUV scaling and conversion functionality. From a845952db86c8cb568aa49e99baca327828d8f02 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Fri, 10 Nov 2017 14:37:09 +0300 Subject: [PATCH 0112/1014] Docs: Add 'giflib' --- docs/packages/media.rst | 2 ++ docs/packages/pkg/giflib.rst | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 docs/packages/pkg/giflib.rst diff --git a/docs/packages/media.rst b/docs/packages/media.rst index cb786094d3..b1f4e0c4c4 100644 --- a/docs/packages/media.rst +++ b/docs/packages/media.rst @@ -1,6 +1,7 @@ .. spelling:: OpenAL + gif Media ----- @@ -10,4 +11,5 @@ Media - :ref:`pkg.PNG` - library for use in applications that read, create, and manipulate PNG (Portable Network Graphics) raster image files. - :ref:`pkg.SDL_mixer` - A sample multi-channel audio mixer library for SDL. - :ref:`pkg.TIFF` + - :ref:`pkg.giflib` - library for reading and writing gif images. - :ref:`pkg.libyuv` - YUV scaling and conversion functionality. diff --git a/docs/packages/pkg/giflib.rst b/docs/packages/pkg/giflib.rst new file mode 100644 index 0000000000..4f4aa00962 --- /dev/null +++ b/docs/packages/pkg/giflib.rst @@ -0,0 +1,21 @@ +.. spelling:: + + giflib + +.. index:: media ; giflib + +.. _pkg.giflib: + +giflib +====== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `David Hirvonen `__ (`pr-1152 `__) + +.. code-block:: cmake + + hunter_add_package(giflib) + find_package(giflib CONFIG REQUIRED) + target_link_libraries(giflib giflib::giflib) From 77afb6e377572da9994a326cb6a6a9f9d77a2bb3 Mon Sep 17 00:00:00 2001 From: Sacha Date: Fri, 10 Nov 2017 21:40:43 +1000 Subject: [PATCH 0113/1014] Add BUILD_SHARED_LIBS support to OpenSSL 1.1+ Windows (#1164) --- cmake/projects/OpenSSL/hunter.cmake | 2 +- .../schemes/url_sha1_openssl_windows_1_1_plus.cmake.in | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/projects/OpenSSL/hunter.cmake b/cmake/projects/OpenSSL/hunter.cmake index a0354dd112..4aa343b71b 100755 --- a/cmake/projects/OpenSSL/hunter.cmake +++ b/cmake/projects/OpenSSL/hunter.cmake @@ -340,4 +340,4 @@ if(MINGW) endif() hunter_cacheable(OpenSSL) -hunter_download(PACKAGE_NAME OpenSSL PACKAGE_INTERNAL_DEPS_ID "15") +hunter_download(PACKAGE_NAME OpenSSL PACKAGE_INTERNAL_DEPS_ID "16") diff --git a/cmake/projects/OpenSSL/schemes/url_sha1_openssl_windows_1_1_plus.cmake.in b/cmake/projects/OpenSSL/schemes/url_sha1_openssl_windows_1_1_plus.cmake.in index 18c21ff6da..b5cb4640b7 100644 --- a/cmake/projects/OpenSSL/schemes/url_sha1_openssl_windows_1_1_plus.cmake.in +++ b/cmake/projects/OpenSSL/schemes/url_sha1_openssl_windows_1_1_plus.cmake.in @@ -71,6 +71,12 @@ else() set(log_opts "") endif() +if (BUILD_SHARED_LIBS) + set(shared "shared") +else() + set(shared "no-shared") +endif() + set(openssl_dir "@HUNTER_PACKAGE_INSTALL_PREFIX@/ssl") file(MAKE_DIRECTORY "${openssl_dir}") @@ -90,7 +96,7 @@ ExternalProject_Add( CONFIGURE_COMMAND "@HUNTER_MSVC_VCVARSALL@" "@HUNTER_MSVC_ARCH@" COMMAND - perl Configure "${opt}" no-asm "--prefix=@HUNTER_PACKAGE_INSTALL_PREFIX@" "--openssldir=${openssl_dir}" + perl Configure "${opt}" ${shared} no-asm "--prefix=@HUNTER_PACKAGE_INSTALL_PREFIX@" "--openssldir=${openssl_dir}" COMMAND nmake COMMAND From 2b65b663e14b28f002e83a34a506290fa3aa7604 Mon Sep 17 00:00:00 2001 From: Isaac Hier Date: Fri, 10 Nov 2017 09:46:38 -0500 Subject: [PATCH 0114/1014] Fix gRPC source --- cmake/projects/gRPC/hunter.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/projects/gRPC/hunter.cmake b/cmake/projects/gRPC/hunter.cmake index 1d7c3c0234..2bd564bca3 100644 --- a/cmake/projects/gRPC/hunter.cmake +++ b/cmake/projects/gRPC/hunter.cmake @@ -8,8 +8,8 @@ include(hunter_pick_scheme) hunter_add_version( PACKAGE_NAME gRPC VERSION "1.6.6" - URL "https://github.com/isaachier/grpc/archive/hunter-1.6.6-p6.tar.gz" - SHA1 "c4abbf4a411f794f4cac2a0ec2311187b6fee31f") + URL "https://github.com/hunter-packages/grpc/archive/v1.6.6-p7.tar.gz" + SHA1 "4658a5f88aad19dc8105a8662db616837bacb6cd") hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(gRPC) From f9fb88d39c79340cb9e720a0558176f51f79137c Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Fri, 10 Nov 2017 12:24:33 -0500 Subject: [PATCH 0115/1014] add lmdb + test (#1172) --- cmake/configs/default.cmake | 1 + cmake/projects/lmdb/hunter.cmake | 26 ++++++++++++++++++++++++++ examples/lmdb/CMakeLists.txt | 18 ++++++++++++++++++ examples/lmdb/foo.cpp | 4 ++++ 4 files changed, 49 insertions(+) create mode 100644 cmake/projects/lmdb/hunter.cmake create mode 100644 examples/lmdb/CMakeLists.txt create mode 100644 examples/lmdb/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 0fef80bd80..96734dd526 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -218,6 +218,7 @@ hunter_config(libsodium VERSION 1.0.10) hunter_config(libuv VERSION 1.14.0-p1) hunter_config(libxml2 VERSION 2.9.4) hunter_config(libyuv VERSION 1514-p3) +hunter_config(lmdb VERSION 0.9.21-p1) hunter_config(log4cplus VERSION 1.2.0-p0) hunter_config(lzma VERSION 5.2.3-p4) hunter_config(mini_chromium VERSION 0.0.1-p2) diff --git a/cmake/projects/lmdb/hunter.cmake b/cmake/projects/lmdb/hunter.cmake new file mode 100644 index 0000000000..e855ffe429 --- /dev/null +++ b/cmake/projects/lmdb/hunter.cmake @@ -0,0 +1,26 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# 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 + lmdb + VERSION + 0.9.21-p1 + URL + "https://github.com/hunter-packages/lmdb/archive/v0.9.21-p1.tar.gz" + SHA1 + 4218e126cbc18756d93a798f56e5e6dd10803aae + ) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(lmdb) +hunter_download(PACKAGE_NAME lmdb) diff --git a/examples/lmdb/CMakeLists.txt b/examples/lmdb/CMakeLists.txt new file mode 100644 index 0000000000..c84c89460e --- /dev/null +++ b/examples/lmdb/CMakeLists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-lmdb) + +hunter_add_package(lmdb) +find_package(liblmdb CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo liblmdb::lmdb) + diff --git a/examples/lmdb/foo.cpp b/examples/lmdb/foo.cpp new file mode 100644 index 0000000000..93e330ab40 --- /dev/null +++ b/examples/lmdb/foo.cpp @@ -0,0 +1,4 @@ +#include + +int main() { +} From dd9272290762d30513bcffcfcf7f22680a97fbf4 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Fri, 10 Nov 2017 13:12:30 -0500 Subject: [PATCH 0116/1014] add re2 + test (#1171) --- cmake/configs/default.cmake | 1 + cmake/projects/re2/hunter.cmake | 26 ++++++++++++++++++++++++++ examples/re2/CMakeLists.txt | 17 +++++++++++++++++ examples/re2/foo.cpp | 4 ++++ 4 files changed, 48 insertions(+) create mode 100644 cmake/projects/re2/hunter.cmake create mode 100644 examples/re2/CMakeLists.txt create mode 100644 examples/re2/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 96734dd526..ee4d282190 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -248,6 +248,7 @@ hunter_config(pugixml VERSION 1.8.1) hunter_config(pybind11 VERSION 2.2.1) hunter_config(rabbitmq-c VERSION 0.7.0-p1) hunter_config(randrproto VERSION 1.3.2) +hunter_config(re2 VERSION 2017.11.01-p0) hunter_config(renderproto VERSION 0.11.1) hunter_config(sm VERSION 1.2.1) hunter_config(Snappy VERSION 1.1.6-p0) diff --git a/cmake/projects/re2/hunter.cmake b/cmake/projects/re2/hunter.cmake new file mode 100644 index 0000000000..9b7b0b7fe6 --- /dev/null +++ b/cmake/projects/re2/hunter.cmake @@ -0,0 +1,26 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# 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 + re2 + VERSION + 2017.11.01-p0 + URL + https://github.com/hunter-packages/re2/archive/2017.11.01-p0.tar.gz + SHA1 + 78ed8b27fe1499a30281f3763bb282ea47636b1a + ) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(re2) +hunter_download(PACKAGE_NAME re2) diff --git a/examples/re2/CMakeLists.txt b/examples/re2/CMakeLists.txt new file mode 100644 index 0000000000..c72b8bf3ac --- /dev/null +++ b/examples/re2/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-re2) + +hunter_add_package(re2) +find_package(RE2 CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo RE2::re2) diff --git a/examples/re2/foo.cpp b/examples/re2/foo.cpp new file mode 100644 index 0000000000..50e8ee41ca --- /dev/null +++ b/examples/re2/foo.cpp @@ -0,0 +1,4 @@ +#include + +int main() { +} From 7727cae32cf681f0cd4219a0d13ca42c3e6107c4 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Fri, 10 Nov 2017 14:22:31 -0500 Subject: [PATCH 0117/1014] add nsync + test (#1169) --- cmake/configs/default.cmake | 1 + cmake/projects/nsync/hunter.cmake | 26 ++++++++++++++++++++++++++ examples/nsync/CMakeLists.txt | 17 +++++++++++++++++ examples/nsync/foo.cpp | 4 ++++ 4 files changed, 48 insertions(+) create mode 100644 cmake/projects/nsync/hunter.cmake create mode 100644 examples/nsync/CMakeLists.txt create mode 100644 examples/nsync/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index ee4d282190..a65c2bd675 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -228,6 +228,7 @@ hunter_config(msgpack VERSION 1.4.1-p2) hunter_config(mtplz VERSION 0.1-p3) hunter_config(nanoflann VERSION 1.2.3-p0) hunter_config(nlohmann_json VERSION 2.1.1-p1) +hunter_config(nsync VERSION 1.14-p1) hunter_config(odb VERSION 2.4.0) hunter_config(odb-boost VERSION 2.4.0) hunter_config(odb-compiler VERSION 2.4.0) diff --git a/cmake/projects/nsync/hunter.cmake b/cmake/projects/nsync/hunter.cmake new file mode 100644 index 0000000000..dd4d7de082 --- /dev/null +++ b/cmake/projects/nsync/hunter.cmake @@ -0,0 +1,26 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# 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 + nsync + VERSION + 1.14-p1 + URL + "https://github.com/hunter-packages/nsync/archive/v1.14-p1.tar.gz" + SHA1 + ba52dbd178fc5162aac4469b67c0b5a684e37075 + ) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(nsync) +hunter_download(PACKAGE_NAME nsync) diff --git a/examples/nsync/CMakeLists.txt b/examples/nsync/CMakeLists.txt new file mode 100644 index 0000000000..730719d6d9 --- /dev/null +++ b/examples/nsync/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-nsync) + +hunter_add_package(nsync) +find_package(nsync CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo nsync::nsync) diff --git a/examples/nsync/foo.cpp b/examples/nsync/foo.cpp new file mode 100644 index 0000000000..9f176988d9 --- /dev/null +++ b/examples/nsync/foo.cpp @@ -0,0 +1,4 @@ +#include "nsync/nsync.h" + +int main() { +} From 636f092becf418ae62d2b36de888d1953ac29ea2 Mon Sep 17 00:00:00 2001 From: NukeBird <32956315+NukeBird@users.noreply.github.com> Date: Fri, 10 Nov 2017 23:47:36 +0300 Subject: [PATCH 0118/1014] Add 'state_machine' package (#1163) --- cmake/configs/default.cmake | 1 + cmake/projects/state_machine/hunter.cmake | 24 ++++++++++++++++++ docs/packages/pkg/state_machine.rst | 20 +++++++++++++++ examples/state_machine/CMakeLists.txt | 16 ++++++++++++ examples/state_machine/foo.cpp | 30 +++++++++++++++++++++++ 5 files changed, 91 insertions(+) create mode 100644 cmake/projects/state_machine/hunter.cmake create mode 100644 docs/packages/pkg/state_machine.rst create mode 100644 examples/state_machine/CMakeLists.txt create mode 100644 examples/state_machine/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index a65c2bd675..f6d6cedb88 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -58,6 +58,7 @@ hunter_config(CppNetlib VERSION 0.10.1-hunter-3) hunter_config(CppNetlibUri VERSION 1.0.4-hunter) hunter_config(CsvParserCPlusPlus VERSION 1.0.1) hunter_config(Eigen VERSION 3.3.4-p0) +hunter_config(state_machine VERSION 1.1) hunter_config(enet VERSION 1.3.13-p1) hunter_config(Expat VERSION 2.1.1) if(MSVC) diff --git a/cmake/projects/state_machine/hunter.cmake b/cmake/projects/state_machine/hunter.cmake new file mode 100644 index 0000000000..446a852769 --- /dev/null +++ b/cmake/projects/state_machine/hunter.cmake @@ -0,0 +1,24 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# All rights reserved. + +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +include(hunter_add_version) +include(hunter_cacheable) +include(hunter_download) +include(hunter_pick_scheme) + +hunter_add_version( + PACKAGE_NAME + state_machine + VERSION + 1.1 + URL + "https://github.com/NukeBird/state_machine/archive/1.1.tar.gz" + SHA1 + 43F37F8D0EF067ED6F853D11F5875A4D83A06756 +) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(state_machine) +hunter_download(PACKAGE_NAME state_machine) diff --git a/docs/packages/pkg/state_machine.rst b/docs/packages/pkg/state_machine.rst new file mode 100644 index 0000000000..698627012c --- /dev/null +++ b/docs/packages/pkg/state_machine.rst @@ -0,0 +1,20 @@ +.. spelling:: + + state_machine + +.. index:: unsorted ; state_machine + +.. _pkg.state_machine: + +state_machine +============= + +- `Official `__ +- `Example `__ +- Added by `NukeBird `__ (`pr-1163 `__) + +.. code-block:: cmake + + hunter_add_package(state_machine) + find_package(state_machine CONFIG REQUIRED) + target_link_libraries(sm state_machine) diff --git a/examples/state_machine/CMakeLists.txt b/examples/state_machine/CMakeLists.txt new file mode 100644 index 0000000000..603822b80d --- /dev/null +++ b/examples/state_machine/CMakeLists.txt @@ -0,0 +1,16 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-state_machine) + +hunter_add_package(state_machine) +find_package(state_machine CONFIG REQUIRED) + +add_executable(sm foo.cpp) +target_link_libraries(sm state_machine) diff --git a/examples/state_machine/foo.cpp b/examples/state_machine/foo.cpp new file mode 100644 index 0000000000..8e3fe881ad --- /dev/null +++ b/examples/state_machine/foo.cpp @@ -0,0 +1,30 @@ +#include +#include + +struct Foo: public State +{ + void update(float dt) override + { + std::cout << "(updated)" << std::endl; + } + + void draw(float dt) override + { + std::cout << "(drawed)" << std::endl; + } +}; + +int main() +{ + StateMachine machine; + + machine.push_state(); + + machine.update(0.0f); + + machine.pop_state(); + + machine.update(0.0f); + + return 0; +} From 539631a3f23b3778913e4835d9b27b6bdf013595 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Fri, 10 Nov 2017 16:27:52 -0500 Subject: [PATCH 0119/1014] add cub w/ package config install (#1162) --- cmake/configs/default.cmake | 1 + cmake/projects/cub/hunter.cmake | 26 ++++++++++++++++++++++++++ examples/cub/CMakeLists.txt | 29 +++++++++++++++++++++++++++++ examples/cub/foo.cu | 8 ++++++++ 4 files changed, 64 insertions(+) create mode 100644 cmake/projects/cub/hunter.cmake create mode 100644 examples/cub/CMakeLists.txt create mode 100644 examples/cub/foo.cu diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index f6d6cedb88..57bf186da6 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -152,6 +152,7 @@ hunter_config(convertutf VERSION 1.0.1) hunter_config(crashpad VERSION v0.0.1-p0) hunter_config(crashup VERSION 0.0.2) hunter_config(cryptopp VERSION 5.6.5) +hunter_config(cub VERSION 1.7.4-p0) hunter_config(cvmatio VERSION 1.0.27-p3) hunter_config(cxxopts VERSION 1.0.0-p0) hunter_config(czmq VERSION 4.0.2-p1) diff --git a/cmake/projects/cub/hunter.cmake b/cmake/projects/cub/hunter.cmake new file mode 100644 index 0000000000..335f5abb49 --- /dev/null +++ b/cmake/projects/cub/hunter.cmake @@ -0,0 +1,26 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# 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 + cub + VERSION + 1.7.4-p0 + URL + "https://github.com/hunter-packages/cub/archive/v1.7.4-p0.tar.gz" + SHA1 + c90ecb5fd3c393371abb9cfbf61d4fd5e36564f1 + ) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(cub) +hunter_download(PACKAGE_NAME cub) diff --git a/examples/cub/CMakeLists.txt b/examples/cub/CMakeLists.txt new file mode 100644 index 0000000000..65f87ae846 --- /dev/null +++ b/examples/cub/CMakeLists.txt @@ -0,0 +1,29 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-cub) + +# Test CMake cub installation, even if find_package(CUDA) fails +hunter_add_package(cub) +find_package(cub CONFIG REQUIRED) + +if(NOT TARGET cub::cub) + message(FATAL_ERROR "Target not found") +endif() + +# Note: Enable CUDA setup for full test, i,e: +# +# find_package(CUDA QUIET REQUIRED) +# if (CUDA_FOUND) +# cuda_add_executable(foo foo.cu) +# target_link_libraries(foo cub::cub) +# endif() + + diff --git a/examples/cub/foo.cu b/examples/cub/foo.cu new file mode 100644 index 0000000000..30c91c2bfb --- /dev/null +++ b/examples/cub/foo.cu @@ -0,0 +1,8 @@ +#include +#include +#include + +#include + +int main() { +} From 9d5934098f8baf8d1f02a1f7f48e92fc29ad693f Mon Sep 17 00:00:00 2001 From: Sacha Date: Sat, 11 Nov 2017 11:58:13 +1000 Subject: [PATCH 0120/1014] Add OpenCV-Extra 3.3.1 --- cmake/projects/OpenCV-Extra/hunter.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cmake/projects/OpenCV-Extra/hunter.cmake b/cmake/projects/OpenCV-Extra/hunter.cmake index 68f0c883bf..7e0f84444c 100644 --- a/cmake/projects/OpenCV-Extra/hunter.cmake +++ b/cmake/projects/OpenCV-Extra/hunter.cmake @@ -7,6 +7,16 @@ include(hunter_add_version) include(hunter_download) include(hunter_pick_scheme) +hunter_add_version( + PACKAGE_NAME + OpenCV-Extra + VERSION + "3.3.1" + URL + "https://github.com/opencv/opencv_contrib/archive/3.3.1.tar.gz" + SHA1 + 3c9167e14af097762f1d689355929c964260ada1 +) hunter_add_version( PACKAGE_NAME From 29a3657e1bb0c104f17ff10455bc6a4fb0245770 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 11 Nov 2017 10:41:39 +0300 Subject: [PATCH 0121/1014] Docs: Add 'lmdb' --- docs/packages/pkg/lmdb.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 docs/packages/pkg/lmdb.rst diff --git a/docs/packages/pkg/lmdb.rst b/docs/packages/pkg/lmdb.rst new file mode 100644 index 0000000000..6e9f05ebcf --- /dev/null +++ b/docs/packages/pkg/lmdb.rst @@ -0,0 +1,21 @@ +.. spelling:: + + lmdb + +.. index:: unsorted ; lmdb + +.. _pkg.lmdb: + +lmdb +==== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `David Hirvonen `__ (`pr-1172 `__) + +.. code-block:: cmake + + hunter_add_package(lmdb) + find_package(liblmdb CONFIG REQUIRED) + target_link_libraries(lmdb liblmdb::lmdb) From 3df9cd62c63ad6529eb81af74effc80e92cbaf65 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 11 Nov 2017 10:56:31 +0300 Subject: [PATCH 0122/1014] Docs: Add 're2' --- docs/packages/pkg/re2.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 docs/packages/pkg/re2.rst diff --git a/docs/packages/pkg/re2.rst b/docs/packages/pkg/re2.rst new file mode 100644 index 0000000000..7cb957742f --- /dev/null +++ b/docs/packages/pkg/re2.rst @@ -0,0 +1,21 @@ +.. spelling:: + + re + +.. index:: unsorted ; re2 + +.. _pkg.re2: + +re2 +=== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `David Hirvonen `__ (`pr-1171 `__) + +.. code-block:: cmake + + hunter_add_package(re2) + find_package(RE2 CONFIG REQUIRED) + target_link_libraries(foo RE2::re2) From f16afee092690b94c6e9184e1b913692827968b2 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 11 Nov 2017 11:05:39 +0300 Subject: [PATCH 0123/1014] Docs: Add 'nsync' --- docs/packages/pkg/nsync.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 docs/packages/pkg/nsync.rst diff --git a/docs/packages/pkg/nsync.rst b/docs/packages/pkg/nsync.rst new file mode 100644 index 0000000000..cf78780b49 --- /dev/null +++ b/docs/packages/pkg/nsync.rst @@ -0,0 +1,21 @@ +.. spelling:: + + nsync + +.. index:: unsorted ; nsync + +.. _pkg.nsync: + +nsync +===== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `David Hirvonen `__ (`pr-1169 `__) + +.. code-block:: cmake + + hunter_add_package(nsync) + find_package(nsync CONFIG REQUIRED) + target_link_libraries(foo nsync::nsync) From 1b647e09f1d78b2553e4c38a9e5070e4f58d84a9 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 11 Nov 2017 11:15:11 +0300 Subject: [PATCH 0124/1014] Docs: Add 'cub' --- docs/packages/pkg/cub.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 docs/packages/pkg/cub.rst diff --git a/docs/packages/pkg/cub.rst b/docs/packages/pkg/cub.rst new file mode 100644 index 0000000000..6e7c7e22cf --- /dev/null +++ b/docs/packages/pkg/cub.rst @@ -0,0 +1,21 @@ +.. spelling:: + + cub + +.. index:: unsorted ; cub + +.. _pkg.cub: + +cub +=== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `David Hirvonen `__ (`pr-1162 `__) + +.. code-block:: cmake + + hunter_add_package(cub) + find_package(cub CONFIG REQUIRED) + target_link_libraries(foo cub::cub) From 89fb7450412728df2d13a71106784e3976ccb4d5 Mon Sep 17 00:00:00 2001 From: Yassine MADDOURI Date: Sat, 11 Nov 2017 16:35:59 +0100 Subject: [PATCH 0125/1014] Update google/benchmark to 1.3.0 (#1185) --- cmake/configs/default.cmake | 2 +- cmake/projects/benchmark/hunter.cmake | 6 ++++++ examples/benchmark/CMakeLists.txt | 4 ++-- examples/benchmark/main.cpp | 24 +++++++++++++++++++++--- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 57bf186da6..c25b1115ce 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -141,7 +141,7 @@ hunter_config(acf VERSION 0.0.1) hunter_config(aes VERSION 0.0.1-p1) hunter_config(aglet VERSION 1.2.0) hunter_config(autobahn-cpp VERSION 0.2.0) -hunter_config(benchmark VERSION 1.2.0) +hunter_config(benchmark VERSION 1.3.0) hunter_config(bison VERSION 3.0.4) hunter_config(boost-pba VERSION 1.0.0-p0) hunter_config(ccv VERSION 0.7-p6) diff --git a/cmake/projects/benchmark/hunter.cmake b/cmake/projects/benchmark/hunter.cmake index 73870bd733..64b8cd1968 100644 --- a/cmake/projects/benchmark/hunter.cmake +++ b/cmake/projects/benchmark/hunter.cmake @@ -6,6 +6,12 @@ include(hunter_cmake_args) include(hunter_download) include(hunter_pick_scheme) +hunter_add_version( + PACKAGE_NAME benchmark + VERSION "1.3.0" + URL "https://github.com/google/benchmark/archive/v1.3.0.tar.gz" + SHA1 "ea74b9d99327f7ef8150dc7c683e6155fa29ef3c") + hunter_add_version( PACKAGE_NAME benchmark VERSION "1.2.0" diff --git a/examples/benchmark/CMakeLists.txt b/examples/benchmark/CMakeLists.txt index eb071db2d5..eda5cf434e 100644 --- a/examples/benchmark/CMakeLists.txt +++ b/examples/benchmark/CMakeLists.txt @@ -8,5 +8,5 @@ hunter_add_package(benchmark) find_package(benchmark CONFIG REQUIRED) -add_executable(main main.cpp) -target_link_libraries(main benchmark::benchmark) +add_executable(bench main.cpp) +target_link_libraries(bench benchmark::benchmark) diff --git a/examples/benchmark/main.cpp b/examples/benchmark/main.cpp index e2455fe16d..687d68441d 100644 --- a/examples/benchmark/main.cpp +++ b/examples/benchmark/main.cpp @@ -1,6 +1,24 @@ +// "Basic usage" example from https://github.com/google/benchmark/blob/v1.3.0/README.md + +// configure, compile and run: +// cmake -H. -Bbuild && cmake --build build && build/bench + +#include #include -int main() -{ - return 0; +static void BM_StringCreation(benchmark::State& state) { + for (auto _ : state) + std::string empty_string; } +// Register the function as a benchmark +BENCHMARK(BM_StringCreation); + +// Define another benchmark +static void BM_StringCopy(benchmark::State& state) { + std::string x = "hello"; + for (auto _ : state) + std::string copy(x); +} +BENCHMARK(BM_StringCopy); + +BENCHMARK_MAIN(); From e284d0393b4490da223699141953759f7d6c230b Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 11 Nov 2017 23:19:36 +0300 Subject: [PATCH 0126/1014] Docs: Creating Hunter badge --- docs/creating-new/create/cmake.rst | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/creating-new/create/cmake.rst b/docs/creating-new/create/cmake.rst index 0e585dbd59..a6f697dcd2 100644 --- a/docs/creating-new/create/cmake.rst +++ b/docs/creating-new/create/cmake.rst @@ -764,3 +764,21 @@ At this moment all branches can be removed: [hunter]> git branch -D pr.hunter_box_1 [hunter]> git branch -D pr.pkg.hunter_box_1 [hunter]> git branch -D test.hunter_box_1 + +Badge +===== + +Badge in ``README.rst`` can signal that package ``hunter_box_1`` is available +via Hunter: + +.. code-block:: none + + |hunter| + + .. |hunter| image:: https://img.shields.io/badge/hunter-hunter_box_1-blue.svg + :target: https://docs.hunter.sh/en/latest/packages/pkg/hunter_box_1.html + :alt: Hunter + +Example: + +* https://github.com/hunter-packages/gauze/blob/master/README.rst From 0785b79efbcd4c4f9eec0f1e4dfe26459d5b5c2e Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sat, 11 Nov 2017 23:26:09 +0300 Subject: [PATCH 0127/1014] Docs: sphinxcontrib-spelling==4.0.1 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 9aaa3e779b..b09ece070f 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ Sphinx==1.6.3 sphinx-rtd-theme==0.2.4 -sphinxcontrib-spelling==2.3.0 +sphinxcontrib-spelling==4.0.1 From 90d6355b9f1d0f6535c5a3fd25573c9d1ed02960 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Sun, 12 Nov 2017 09:35:20 +0300 Subject: [PATCH 0128/1014] gauze 0.2.0 --- cmake/configs/default.cmake | 2 +- cmake/projects/gauze/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index c25b1115ce..af4c5335cb 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -180,7 +180,7 @@ hunter_config(flatbuffers VERSION 1.3.0-p3) hunter_config(flex VERSION 2.6.4) hunter_config(fmt VERSION 4.0.0) hunter_config(freetype VERSION 2.6.2) -hunter_config(gauze VERSION 0.1.2) +hunter_config(gauze VERSION 0.2.0) hunter_config(gemmlowp VERSION 1.0.0) hunter_config(geos VERSION 3.4.2) hunter_config(giflib VERSION 5.1.4-p0) diff --git a/cmake/projects/gauze/hunter.cmake b/cmake/projects/gauze/hunter.cmake index 4a48dfea12..bc731d023b 100644 --- a/cmake/projects/gauze/hunter.cmake +++ b/cmake/projects/gauze/hunter.cmake @@ -42,6 +42,17 @@ hunter_add_version( 43e56210b7f42bd83bb15a91acb1f940037da329 ) +hunter_add_version( + PACKAGE_NAME + gauze + VERSION + 0.2.0 + URL + "https://github.com/hunter-packages/gauze/archive/v0.2.0.tar.gz" + SHA1 + 1e5705ce502b2794a5bc13bbd7964e9c0010fa25 +) + hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(gauze) hunter_cmake_args(gauze CMAKE_ARGS GAUZE_BUILD_TESTS=OFF) From 5bc4565094d32f80a22880d6f04375092aed0d78 Mon Sep 17 00:00:00 2001 From: Sacha Date: Sun, 12 Nov 2017 17:06:30 +1000 Subject: [PATCH 0129/1014] Add OpenCV 3.3.1 (#1180) --- cmake/configs/default.cmake | 4 ++-- cmake/projects/OpenCV/hunter.cmake | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index af4c5335cb..3261911610 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -94,8 +94,8 @@ hunter_config(OpenAL VERSION 1.18.2) hunter_config(OpenBLAS VERSION 0.2.20-p0) hunter_config(OpenCL VERSION 2.1-p3) hunter_config(OpenCL-cpp VERSION 2.0.10-p0) -hunter_config(OpenCV VERSION 3.3.0-p2) -hunter_config(OpenCV-Extra VERSION 3.3.0) +hunter_config(OpenCV VERSION 3.3.1-p0) +hunter_config(OpenCV-Extra VERSION 3.3.1) hunter_config(OpenNMTTokenizer VERSION 0.2.0-p1) hunter_config(OpenSSL VERSION 1.1.0g) hunter_config(PNG VERSION 1.6.26-p1) diff --git a/cmake/projects/OpenCV/hunter.cmake b/cmake/projects/OpenCV/hunter.cmake index 4ca228f082..e4242f5f08 100644 --- a/cmake/projects/OpenCV/hunter.cmake +++ b/cmake/projects/OpenCV/hunter.cmake @@ -12,6 +12,17 @@ include(hunter_download) include(hunter_pick_scheme) # List of versions here... +hunter_add_version( + PACKAGE_NAME + OpenCV + VERSION + "3.3.1-p0" + URL + "https://github.com/hunter-packages/opencv/archive/v3.3.1-p0.tar.gz" + SHA1 + cca79df3db45c1a1d8da3a4952d04d69c1710508 +) + hunter_add_version( PACKAGE_NAME From 61769993d25329c750cc6f0f6df22aa883f6dd9b Mon Sep 17 00:00:00 2001 From: dvirtz Date: Thu, 9 Nov 2017 20:47:07 +0200 Subject: [PATCH 0130/1014] add Catch 2.0.1 --- cmake/configs/default.cmake | 2 +- cmake/projects/Catch/hunter.cmake | 18 ++++++++++++ examples/Catch/CMakeLists.txt | 48 ++++++++++++++----------------- 3 files changed, 41 insertions(+), 27 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 3261911610..7058d2b9cd 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -136,8 +136,8 @@ hunter_config(ZLIB VERSION 1.2.8-p3) hunter_config(ZMQPP VERSION 4.1.2) hunter_config(ZeroMQ VERSION 4.2.3-p1) hunter_config(caffe VERSION rc3-p2) -hunter_config(Catch VERSION 1.8.2-p0) hunter_config(acf VERSION 0.0.1) +hunter_config(Catch VERSION 2.0.1) hunter_config(aes VERSION 0.0.1-p1) hunter_config(aglet VERSION 1.2.0) hunter_config(autobahn-cpp VERSION 0.2.0) diff --git a/cmake/projects/Catch/hunter.cmake b/cmake/projects/Catch/hunter.cmake index 3640685df4..0e9fbbbae8 100644 --- a/cmake/projects/Catch/hunter.cmake +++ b/cmake/projects/Catch/hunter.cmake @@ -7,6 +7,18 @@ include(hunter_add_version) include(hunter_pick_scheme) include(hunter_cacheable) include(hunter_download) +include(hunter_cmake_args) + +hunter_add_version( + PACKAGE_NAME + Catch + VERSION + "2.0.1" + URL + "https://github.com/hunter-packages/Catch/archive/v2.0.1-p0.tar.gz" + SHA1 + fbfa84ce24b33386f80fe34bc855455de8b8e45e +) hunter_add_version( PACKAGE_NAME @@ -30,6 +42,12 @@ hunter_add_version( 737cb1c98fedccceb95e7bfd385e5dea0ad5d047 ) +hunter_cmake_args( + Catch + CMAKE_ARGS + NO_SELFTEST=TRUE +) + hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(Catch) hunter_download(PACKAGE_NAME Catch) diff --git a/examples/Catch/CMakeLists.txt b/examples/Catch/CMakeLists.txt index 0081374952..6ff5eb5c8f 100644 --- a/examples/Catch/CMakeLists.txt +++ b/examples/Catch/CMakeLists.txt @@ -1,26 +1,22 @@ -# Copyright (c) 2016 Alexey Ulyanov -# All rights reserved. - -cmake_minimum_required(VERSION 3.0.2) - -# Emulate HunterGate: -# * https://github.com/hunter-packages/gate -include("../common.cmake") - -project(download-Catch) -set(CMAKE_CXX_STANDARD 98) - -hunter_add_package(Catch) - -find_package(Catch CONFIG REQUIRED) - -set(SOURCES main.cpp - foo_test.cpp - foo.cpp) -set(HEADERS foo.hpp) - -add_executable(foo_test ${SOURCES} ${HEADERS}) -target_link_libraries(foo_test PUBLIC Catch::Catch) - -enable_testing(true) -add_test(NAME foo_test COMMAND foo_test) +# Copyright (c) 2016 Alexey Ulyanov +# All rights reserved. + +cmake_minimum_required(VERSION 3.0.2) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-Catch) + +hunter_add_package(Catch) + +find_package(Catch CONFIG REQUIRED) + +set(SOURCES main.cpp + foo_test.cpp + foo.cpp) +set(HEADERS foo.hpp) + +add_executable(foo_test ${SOURCES} ${HEADERS}) +target_link_libraries(foo_test PUBLIC Catch::Catch) \ No newline at end of file From ae98e4f5330a30241137f6ee0fb8aeaff1940332 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Sun, 12 Nov 2017 15:25:15 -0500 Subject: [PATCH 0131/1014] add boringssl + test (#1186) --- cmake/configs/default.cmake | 1 + cmake/projects/BoringSSL/hunter.cmake | 30 +++++++++++++++++++++++++++ examples/BoringSSL/CMakeLists.txt | 17 +++++++++++++++ examples/BoringSSL/foo.cpp | 5 +++++ 4 files changed, 53 insertions(+) create mode 100644 cmake/projects/BoringSSL/hunter.cmake create mode 100644 examples/BoringSSL/CMakeLists.txt create mode 100644 examples/BoringSSL/foo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 7058d2b9cd..b2757fb863 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -48,6 +48,7 @@ else() endif() hunter_config(BoostCompute VERSION 0.5-p0) hunter_config(BoostProcess VERSION 0.5) +hunter_config(BoringSSL VERSION 1.0.0) hunter_config(CapnProto VERSION 0.6.1) hunter_config(CLAPACK VERSION 3.2.1) hunter_config(CURL VERSION 7.49.1-DEV-v9) diff --git a/cmake/projects/BoringSSL/hunter.cmake b/cmake/projects/BoringSSL/hunter.cmake new file mode 100644 index 0000000000..9930fbbe51 --- /dev/null +++ b/cmake/projects/BoringSSL/hunter.cmake @@ -0,0 +1,30 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# 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 + BoringSSL + VERSION + 1.0.0 + URL + "https://github.com/hunter-packages/boringssl/archive/v1.0.0.tar.gz" + SHA1 + caa7cd122960c9427bda30db5020b9058cb1ed0a + ) + +if(MSVC) + hunter_cmake_args(BoringSSL CMAKE_ARGS OPENSSL_NO_ASM=YES) +endif() + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(BoringSSL) +hunter_download(PACKAGE_NAME BoringSSL) diff --git a/examples/BoringSSL/CMakeLists.txt b/examples/BoringSSL/CMakeLists.txt new file mode 100644 index 0000000000..a67d43028b --- /dev/null +++ b/examples/BoringSSL/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# Copyright (c) 2017, David Hirvonen +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-BoringSSL) + +hunter_add_package(BoringSSL) +find_package(BoringSSL CONFIG REQUIRED) + +add_executable(foo foo.cpp) +target_link_libraries(foo BoringSSL::ssl BoringSSL::crypto) diff --git a/examples/BoringSSL/foo.cpp b/examples/BoringSSL/foo.cpp new file mode 100644 index 0000000000..18c854b7fc --- /dev/null +++ b/examples/BoringSSL/foo.cpp @@ -0,0 +1,5 @@ +#include + +int main() { + auto *rsa = RSA_new(); +} From 2a00835c620870fe8b6a6a2cfdd6af6008fb06c9 Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Mon, 13 Nov 2017 01:13:50 +0300 Subject: [PATCH 0132/1014] Docs: Add BoringSSL --- docs/packages/pkg/BoringSSL.rst | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 docs/packages/pkg/BoringSSL.rst diff --git a/docs/packages/pkg/BoringSSL.rst b/docs/packages/pkg/BoringSSL.rst new file mode 100644 index 0000000000..7a3d00f9d4 --- /dev/null +++ b/docs/packages/pkg/BoringSSL.rst @@ -0,0 +1,28 @@ +.. spelling:: + + BoringSSL + +.. index:: crypto ; BoringSSL + +.. _pkg.BoringSSL: + +BoringSSL +========= + +.. warning:: + + * This library implements :ref:`pkg.OpenSSL` API. Usage of this package + can lead to conflicts. Please read + `this issue `__ + and make sure you're understand what you're doing. + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `David Hirvonen `__ (`pr-1186 `__) + +.. code-block:: cmake + + hunter_add_package(BoringSSL) + find_package(BoringSSL CONFIG REQUIRED) + target_link_libraries(boo BoringSSL::ssl BoringSSL::crypto) From 9d9c82f6e041d0e3c0cff8cee61685329228491a Mon Sep 17 00:00:00 2001 From: shekharhimanshu Date: Mon, 13 Nov 2017 19:23:15 +0900 Subject: [PATCH 0133/1014] Fix build error in PocoCpp when POCO_UNBUNDLED is ON. --- cmake/configs/default.cmake | 2 +- cmake/projects/PocoCpp/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index b2757fb863..03df19a3e4 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -100,7 +100,7 @@ hunter_config(OpenCV-Extra VERSION 3.3.1) hunter_config(OpenNMTTokenizer VERSION 0.2.0-p1) hunter_config(OpenSSL VERSION 1.1.0g) hunter_config(PNG VERSION 1.6.26-p1) -hunter_config(PocoCpp VERSION 1.7.9-p0) +hunter_config(PocoCpp VERSION 1.7.9-p1) hunter_config(PostgreSQL VERSION 10.0.0) hunter_config(Protobuf VERSION 3.3.0) diff --git a/cmake/projects/PocoCpp/hunter.cmake b/cmake/projects/PocoCpp/hunter.cmake index c394472b69..302a607171 100644 --- 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.7.9-p1 + URL + "https://github.com/hunter-packages/poco/archive/v1.7.9-p1.zip" + SHA1 + 28adb9a84af3000dde5525c14e906f5f5ea095f3 +) + hunter_add_version( PACKAGE_NAME PocoCpp From 6525a66d188929390b334363ef44034e7604dae6 Mon Sep 17 00:00:00 2001 From: isaachier Date: Mon, 13 Nov 2017 13:03:02 -0500 Subject: [PATCH 0134/1014] LibCDS (#1194) --- cmake/configs/default.cmake | 1 + cmake/projects/LibCDS/hunter.cmake | 16 ++++++++++++++++ docs/packages/concurrency.rst | 2 ++ docs/packages/pkg/LibCDS.rst | 21 +++++++++++++++++++++ examples/LibCDS/CMakeLists.txt | 12 ++++++++++++ examples/LibCDS/main.cpp | 6 ++++++ 6 files changed, 58 insertions(+) create mode 100644 cmake/projects/LibCDS/hunter.cmake create mode 100644 docs/packages/pkg/LibCDS.rst create mode 100644 examples/LibCDS/CMakeLists.txt create mode 100644 examples/LibCDS/main.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index b2757fb863..101b6f4a8e 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -82,6 +82,7 @@ hunter_config(LLVM VERSION 4.0.1-p0) # Clang hunter_config(LLVMCompilerRT VERSION 4.0.1-patched) # Clang hunter_config(Leathers VERSION 0.1.6) hunter_config(Leptonica VERSION 1.74.2-p4) +hunter_config(LibCDS VERSION 2.3.1) hunter_config(Libcxx VERSION 3.6.2) # Clang hunter_config(Libcxxabi VERSION 3.6.2) # Clang hunter_config(Libevent VERSION 2.1.8-p3) diff --git a/cmake/projects/LibCDS/hunter.cmake b/cmake/projects/LibCDS/hunter.cmake new file mode 100644 index 0000000000..0397f169b8 --- /dev/null +++ b/cmake/projects/LibCDS/hunter.cmake @@ -0,0 +1,16 @@ +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +include(hunter_add_version) +include(hunter_cacheable) +include(hunter_download) +include(hunter_pick_scheme) + +hunter_add_version( + PACKAGE_NAME LibCDS + VERSION "2.3.1" + URL "https://github.com/hunter-packages/libcds/archive/v2.3.1-p0.tar.gz" + SHA1 "86cc0d2d57075830feaaa1c6e1200e970b96f9f8") + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(LibCDS) +hunter_download(PACKAGE_NAME LibCDS) diff --git a/docs/packages/concurrency.rst b/docs/packages/concurrency.rst index 4b4cabbdd0..ea292c1109 100644 --- a/docs/packages/concurrency.rst +++ b/docs/packages/concurrency.rst @@ -4,6 +4,7 @@ HPC GPGPU GPU + LibCDS libdill libmill @@ -14,6 +15,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.LibCDS` - C++ library of Concurrent Data Structures - :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 diff --git a/docs/packages/pkg/LibCDS.rst b/docs/packages/pkg/LibCDS.rst new file mode 100644 index 0000000000..e441bab246 --- /dev/null +++ b/docs/packages/pkg/LibCDS.rst @@ -0,0 +1,21 @@ +.. spelling:: + + LibCDS + +.. index:: concurrency ; LibCDS + +.. _pkg.LibCDS: + +LibCDS +====== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `Isaac Hier `__ (`pr-1194 `__) + +.. code-block:: cmake + + hunter_add_package(LibCDS) + find_package(LibCDS CONFIG REQUIRED) + target_link_libraries(... LibCDS::cds) # Use cds-s for static library diff --git a/examples/LibCDS/CMakeLists.txt b/examples/LibCDS/CMakeLists.txt new file mode 100644 index 0000000000..76810c5912 --- /dev/null +++ b/examples/LibCDS/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.1) + +include("../common.cmake") + +project(download-LibCDS) + +hunter_add_package(LibCDS) + +find_package(LibCDS CONFIG REQUIRED) + +add_executable(main main.cpp) +target_link_libraries(main LibCDS::cds) # Use LibCDS::cds-s for static library diff --git a/examples/LibCDS/main.cpp b/examples/LibCDS/main.cpp new file mode 100644 index 0000000000..16bb990642 --- /dev/null +++ b/examples/LibCDS/main.cpp @@ -0,0 +1,6 @@ +#include + +int main() +{ + return 0; +} From 933e0986b6da42f72b3f591310cda0b588bc2608 Mon Sep 17 00:00:00 2001 From: dvirtz Date: Mon, 13 Nov 2017 22:34:09 +0200 Subject: [PATCH 0135/1014] add mongoose (#1195) --- cmake/configs/default.cmake | 1 + cmake/projects/mongoose/hunter.cmake | 24 ++++++++++++++++ docs/packages/networking.rst | 1 + docs/packages/pkg/mongoose.rst | 23 +++++++++++++++ examples/mongoose/CMakeLists.txt | 16 +++++++++++ examples/mongoose/simplest_web_server.c | 38 +++++++++++++++++++++++++ 6 files changed, 103 insertions(+) create mode 100644 cmake/projects/mongoose/hunter.cmake create mode 100644 docs/packages/pkg/mongoose.rst create mode 100644 examples/mongoose/CMakeLists.txt create mode 100644 examples/mongoose/simplest_web_server.c diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 101b6f4a8e..9a3a829fa9 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -227,6 +227,7 @@ hunter_config(log4cplus VERSION 1.2.0-p0) hunter_config(lzma VERSION 5.2.3-p4) hunter_config(mini_chromium VERSION 0.0.1-p2) hunter_config(minizip VERSION 1.0.1-p1) +hunter_config(mongoose VERSION 6.10) hunter_config(mpark_variant VERSION 1.0.0) hunter_config(msgpack VERSION 1.4.1-p2) hunter_config(mtplz VERSION 0.1-p3) diff --git a/cmake/projects/mongoose/hunter.cmake b/cmake/projects/mongoose/hunter.cmake new file mode 100644 index 0000000000..adc2b252cf --- /dev/null +++ b/cmake/projects/mongoose/hunter.cmake @@ -0,0 +1,24 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# All rights reserved. + +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +include(hunter_add_version) +include(hunter_cacheable) +include(hunter_download) +include(hunter_pick_scheme) + +hunter_add_version( + PACKAGE_NAME + mongoose + VERSION + 6.10 + URL + https://github.com/hunter-packages/mongoose/archive/6.10-p.tar.gz + SHA1 + 7f2af8da196c29a60f597b67cde5706d0acb20a0 +) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(mongoose) +hunter_download(PACKAGE_NAME mongoose) diff --git a/docs/packages/networking.rst b/docs/packages/networking.rst index 289a9569a7..6055777a4a 100644 --- a/docs/packages/networking.rst +++ b/docs/packages/networking.rst @@ -19,6 +19,7 @@ Networking - :ref:`pkg.CURL` - A command line tool and library for transferring data with URL syntax - :ref:`pkg.gRPC` - A high performance, open-source universal RPC framework - :ref:`pkg.Libevent` - An event notification library for developing scalable network servers. + - :ref:`pkg.mongoose` - Embedded Web Server Library. - :ref:`pkg.Libssh2` - :ref:`pkg.PocoCpp` - Cross-platform C++ libraries with a network/internet focus. - :ref:`pkg.websocketpp` - C++ websocket client/server library diff --git a/docs/packages/pkg/mongoose.rst b/docs/packages/pkg/mongoose.rst new file mode 100644 index 0000000000..c3a6e19eef --- /dev/null +++ b/docs/packages/pkg/mongoose.rst @@ -0,0 +1,23 @@ +.. spelling:: + + mongoose + +.. index:: unsorted ; mongoose + +.. _pkg.mongoose: + +mongoose +============ + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `dvirtz `__ (`pr-1195 `__) + +.. code-block:: cmake + + hunter_add_package(mongoose) + find_package(mongoose CONFIG REQUIRED) + + add_executable(mongoose ...) + target_link_libraries(mongoose mongoose::mongoose) diff --git a/examples/mongoose/CMakeLists.txt b/examples/mongoose/CMakeLists.txt new file mode 100644 index 0000000000..fb3178ff27 --- /dev/null +++ b/examples/mongoose/CMakeLists.txt @@ -0,0 +1,16 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-mongoose) + +hunter_add_package(mongoose) +find_package(mongoose CONFIG REQUIRED) + +add_executable(mongoose simplest_web_server.c) +target_link_libraries(mongoose mongoose::mongoose) diff --git a/examples/mongoose/simplest_web_server.c b/examples/mongoose/simplest_web_server.c new file mode 100644 index 0000000000..297f9b316c --- /dev/null +++ b/examples/mongoose/simplest_web_server.c @@ -0,0 +1,38 @@ +// Copyright (c) 2015 Cesanta Software Limited +// All rights reserved + +#include + +static const char *s_http_port = "8000"; +static struct mg_serve_http_opts s_http_server_opts; + +static void ev_handler(struct mg_connection *nc, int ev, void *p) { + if (ev == MG_EV_HTTP_REQUEST) { + mg_serve_http(nc, (struct http_message *) p, s_http_server_opts); + } +} + +int main(void) { + struct mg_mgr mgr; + struct mg_connection *nc; + + mg_mgr_init(&mgr, NULL); + printf("Starting web server on port %s\n", s_http_port); + nc = mg_bind(&mgr, s_http_port, ev_handler); + if (nc == NULL) { + printf("Failed to create listener\n"); + return 1; + } + + // Set up HTTP server parameters + mg_set_protocol_http_websocket(nc); + s_http_server_opts.document_root = "."; // Serve current directory + s_http_server_opts.enable_directory_listing = "yes"; + + for (;;) { + mg_mgr_poll(&mgr, 1000); + } + mg_mgr_free(&mgr); + + return 0; +} From 00b23424f2d09c2f06e3bdb2661f3b83c9e89efe Mon Sep 17 00:00:00 2001 From: Ruslan Baratov Date: Tue, 14 Nov 2017 12:54:58 +0300 Subject: [PATCH 0136/1014] GTest 1.8.0-hunter-p10 --- cmake/configs/default.cmake | 2 +- cmake/projects/GTest/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 9a3a829fa9..335dc3e1e4 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -302,7 +302,7 @@ hunter_config(yaml-cpp VERSION 0.5.3-plus-p0) if(MSVC80) hunter_config(GTest VERSION 1.7.0-hunter-6) else() - hunter_config(GTest VERSION 1.8.0-hunter-p9) + hunter_config(GTest VERSION 1.8.0-hunter-p10) endif() if(ANDROID) diff --git a/cmake/projects/GTest/hunter.cmake b/cmake/projects/GTest/hunter.cmake index fe5b295883..411a302991 100644 --- a/cmake/projects/GTest/hunter.cmake +++ b/cmake/projects/GTest/hunter.cmake @@ -205,6 +205,17 @@ hunter_add_version( a345f16cb610e0b5dfa7778dc2852b784cfede5b ) +hunter_add_version( + PACKAGE_NAME + GTest + VERSION + 1.8.0-hunter-p10 + URL + "https://github.com/hunter-packages/googletest/archive/1.8.0-hunter-p10.tar.gz" + SHA1 + 1d92c9f51af756410843b13f8c4e4df09e235394 +) + if(HUNTER_GTest_VERSION VERSION_LESS 1.8.0) set(_gtest_license "LICENSE") else() From 9423b287f78ac28aa2396ebe444b45d395d68da5 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 14 Nov 2017 12:49:15 +0100 Subject: [PATCH 0137/1014] Edited Windows testing commands (#1200) --- docs/creating-new/create/cmake.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/creating-new/create/cmake.rst b/docs/creating-new/create/cmake.rst index a6f697dcd2..91c3ebb621 100644 --- a/docs/creating-new/create/cmake.rst +++ b/docs/creating-new/create/cmake.rst @@ -420,8 +420,10 @@ Script ``jenkins.py`` will package a temporary Hunter archive based on current state and build the specified example. This script uses `Polly `__ toolchains. -Check you have Python 3 installed, clone Polly and add its ``bin`` folder to -``PATH`` environment variable: +Check you have Python 3 installed, clone Polly, add its ``bin`` folder to +``PATH`` environment variable, go back to Hunter repository and run test. + +On Linux: .. code-block:: none @@ -432,12 +434,7 @@ Check you have Python 3 installed, clone Polly and add its ``bin`` folder to > cd polly [polly]> export PATH="`pwd`/bin:$PATH" -Go back to Hunter repository and run test: - -.. code-block:: none - > cd hunter - [hunter]> which polly.py /.../bin/polly.py @@ -452,8 +449,11 @@ On Windows: .. code-block:: none - > cd hunter + > git clone https://github.com/ruslo/polly + > cd polly + [polly]> set PATH=%CD%\bin;%PATH% + > cd hunter [hunter]> where polly.py C:\...\bin\polly.py From d43257dba489fa4a0e2b8af3d7aeb353d67ecd95 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Tue, 14 Nov 2017 18:05:17 +0100 Subject: [PATCH 0138/1014] Add 'IF97' package (#1201) --- cmake/configs/default.cmake | 1 + cmake/projects/IF97/hunter.cmake | 31 +++++++++++++++++++++++++++ docs/packages/pkg/IF97.rst | 21 +++++++++++++++++++ examples/IF97/CMakeLists.txt | 16 ++++++++++++++ examples/IF97/IF97.cpp | 36 ++++++++++++++++++++++++++++++++ 5 files changed, 105 insertions(+) create mode 100644 cmake/projects/IF97/hunter.cmake create mode 100644 docs/packages/pkg/IF97.rst create mode 100644 examples/IF97/CMakeLists.txt create mode 100644 examples/IF97/IF97.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 335dc3e1e4..0d854567ca 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -346,3 +346,4 @@ endif() hunter_config(zookeeper VERSION 3.4.9-p2) hunter_config(tacopie VERSION 2.4.0-h1) hunter_config(cpp_redis VERSION 3.5.0-h1) +hunter_config(IF97 VERSION 2.1.2) diff --git a/cmake/projects/IF97/hunter.cmake b/cmake/projects/IF97/hunter.cmake new file mode 100644 index 0000000000..70b7154eb4 --- /dev/null +++ b/cmake/projects/IF97/hunter.cmake @@ -0,0 +1,31 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# All rights reserved. + +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +include(hunter_add_version) +include(hunter_cmake_args) +include(hunter_pick_scheme) +include(hunter_cacheable) +include(hunter_download) + +hunter_add_version( + PACKAGE_NAME + IF97 + VERSION + 2.1.2 + URL + "https://github.com/CoolProp/IF97/archive/v2.1.2.tar.gz" + SHA1 + 84d7a541d7aee33c708b25499c82e12cf68f63f1 +) + +hunter_cmake_args( + IF97 + CMAKE_ARGS + IF97_CMAKE_MODULE=ON +) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(IF97) +hunter_download(PACKAGE_NAME IF97) diff --git a/docs/packages/pkg/IF97.rst b/docs/packages/pkg/IF97.rst new file mode 100644 index 0000000000..8eff4c6131 --- /dev/null +++ b/docs/packages/pkg/IF97.rst @@ -0,0 +1,21 @@ +.. spelling:: + + IF97 + +.. index:: science ; IF97 + +.. _pkg.IF97: + +IF97 +==== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `Jorrit Wronski `__ (`pr-1201 `__) + +.. code-block:: cmake + + hunter_add_package(IF97) + find_package(IF97 CONFIG REQUIRED) + target_link_libraries(IF97 IF97::IF97) diff --git a/examples/IF97/CMakeLists.txt b/examples/IF97/CMakeLists.txt new file mode 100644 index 0000000000..16455c0321 --- /dev/null +++ b/examples/IF97/CMakeLists.txt @@ -0,0 +1,16 @@ +# Copyright (c) 2016-2017, Ruslan Baratov +# All rights reserved. + +cmake_minimum_required(VERSION 3.0) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-IF97) + +hunter_add_package(IF97) +find_package(IF97 CONFIG REQUIRED) + +add_executable(IF97 IF97.cpp) +target_link_libraries(IF97 IF97::IF97) diff --git a/examples/IF97/IF97.cpp b/examples/IF97/IF97.cpp new file mode 100644 index 0000000000..7ed92dddd6 --- /dev/null +++ b/examples/IF97/IF97.cpp @@ -0,0 +1,36 @@ +// This compiler flag causes input/output units on the Thermodynamic Properties in IF97.h +// to take pressure units of [MPa] and Energy units of [kJ] for comparison with IAPWS +// table values. If not set, the default behavior of IF97.h is to use straight SI units +// with pressure in [Pa] and enthalpy in [J]. +#define IAPWS_UNITS + +#include +#include + +int main(){ + + using namespace IF97; + + printf("*****************************************************************\n"); + printf("******************** Verification Tables ************************\n"); + printf("* Tables below are printed for verification. Unless otherwise *\n"); + printf("* noted, tables are reproduced from the *\n"); + printf("* \"Revised Release on the IAPWS Industrial Formulation 1997\" *\n"); + printf("* IAPWS R7-97(2012). *\n"); + printf("*****************************************************************\n\n\n"); + + + double T1 = 300, T2 = 300, T3 = 500, p1 = 3, p2 = 80, p3 = 3; + printf("*****************************************************************\n"); + printf("******************** Table 5 - Region 1 *************************\n"); + printf("*****************************************************************\n"); + printf("%5s %11.8e %11.8e %11.8e\n", "v", 1/rhomass_Tp(T1, p1), 1/rhomass_Tp(T2, p2), 1/rhomass_Tp(T3, p3)); + printf("%5s %11.8e %11.8e %11.8e\n", "h", hmass_Tp(T1, p1), hmass_Tp(T2, p2), hmass_Tp(T3, p3)); + printf("%5s %11.8e %11.8e %11.8e\n", "u", umass_Tp(T1, p1), umass_Tp(T2, p2), umass_Tp(T3, p3)); + printf("%5s %11.8e %11.8e %11.8e\n", "s", smass_Tp(T1, p1), smass_Tp(T2, p2), smass_Tp(T3, p3)); + printf("%5s %11.8e %11.8e %11.8e\n", "cp", cpmass_Tp(T1, p1), cpmass_Tp(T2, p2), cpmass_Tp(T3, p3)); + printf("%5s %11.8e %11.8e %11.8e\n", "w", speed_sound_Tp(T1, p1), speed_sound_Tp(T2, p2), speed_sound_Tp(T3, p3)); + printf("***************************************************************\n\n"); + + return 0; +} \ No newline at end of file From d06b5030f44ab8c16eee1773cbc5f28d41b1fc3c Mon Sep 17 00:00:00 2001 From: isaachier Date: Wed, 15 Nov 2017 07:32:50 -0500 Subject: [PATCH 0139/1014] Use custom bison with patch to fix macOS High Sierra build (#1202) --- cmake/configs/default.cmake | 2 +- cmake/projects/bison/hunter.cmake | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 0d854567ca..1d01acc04d 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -144,7 +144,7 @@ hunter_config(aes VERSION 0.0.1-p1) hunter_config(aglet VERSION 1.2.0) hunter_config(autobahn-cpp VERSION 0.2.0) hunter_config(benchmark VERSION 1.3.0) -hunter_config(bison VERSION 3.0.4) +hunter_config(bison VERSION 3.0.4-p0) hunter_config(boost-pba VERSION 1.0.0-p0) hunter_config(ccv VERSION 0.7-p6) hunter_config(cereal VERSION 1.2.2-p0) diff --git a/cmake/projects/bison/hunter.cmake b/cmake/projects/bison/hunter.cmake index 9fb74c4d68..65127c21a9 100644 --- a/cmake/projects/bison/hunter.cmake +++ b/cmake/projects/bison/hunter.cmake @@ -6,14 +6,21 @@ include(hunter_download) include(hunter_pick_scheme) hunter_add_version( - PACKAGE_NAME - bison - VERSION - "3.0.4" - URL - "https://ftp.gnu.org/gnu/bison/bison-3.0.4.tar.gz" - SHA1 - ec1f2706a7cfedda06d29dc394b03e092a1e1b74 + PACKAGE_NAME + bison + VERSION + "3.0.4" + URL "https://ftp.gnu.org/gnu/bison/bison-3.0.4.tar.gz" + SHA1 "ec1f2706a7cfedda06d29dc394b03e092a1e1b74" +) + +hunter_add_version( + PACKAGE_NAME + bison + VERSION + "3.0.4-p0" + URL "https://github.com/hunter-packages/bison/releases/download/v3.0.4/bison-3.0.4.tar.gz" + SHA1 "984caba9061e21d048b71a49bf553d2e32ac8252" ) hunter_configuration_types(bison CONFIGURATION_TYPES Release) From 98150c454c6dd69a4e37dcea479d784632b4b5ab Mon Sep 17 00:00:00 2001 From: isaachier Date: Thu, 16 Nov 2017 13:12:55 -0500 Subject: [PATCH 0140/1014] Thrift (#1208) --- cmake/configs/default.cmake | 2 +- cmake/projects/thrift/hunter.cmake | 25 ++++++++++++++++++++++--- docs/packages/pkg/thrift.rst | 19 +++++++++++++++---- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 1d01acc04d..54249152c3 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -269,7 +269,7 @@ endif() hunter_config(szip VERSION 2.1.0-p1) hunter_config(Tesseract VERSION 3.05.01-hunter-3) hunter_config(thread-pool-cpp VERSION 1.1.0) -hunter_config(thrift VERSION 0.10.0-p1) +hunter_config(thrift VERSION 0.10.0-p2) hunter_config(tinydir VERSION 1.2-p0) hunter_config(type_safe VERSION 0.1) hunter_config(util_linux VERSION 2.30.1) diff --git a/cmake/projects/thrift/hunter.cmake b/cmake/projects/thrift/hunter.cmake index 89b1bdd676..17a983940b 100644 --- a/cmake/projects/thrift/hunter.cmake +++ b/cmake/projects/thrift/hunter.cmake @@ -1,6 +1,7 @@ # !!! DO NOT PLACE HEADER GUARDS HERE !!! include(hunter_add_version) +include(hunter_cacheable) include(hunter_cmake_args) include(hunter_download) include(hunter_pick_scheme) @@ -17,6 +18,12 @@ hunter_add_version( URL "https://github.com/hunter-packages/thrift/archive/v0.10.0-p1.tar.gz" SHA1 "7ac349820b9abe5d613f32474e4e1efb41d2b536") +hunter_add_version( + PACKAGE_NAME thrift + VERSION "0.10.0-p2" + URL "https://github.com/hunter-packages/thrift/archive/v0.10.0-p2.tar.gz" + SHA1 "9060fe039f57ea11d1143299b456ff98d4cc56c2") + hunter_add_version( PACKAGE_NAME thrift VERSION "0.9.2" @@ -29,17 +36,29 @@ hunter_add_version( URL "https://github.com/hunter-packages/thrift/archive/v0.9.2-p1.tar.gz" SHA1 "b097d5df29681d57c2b75ecfc4400b5ab28252ba") +hunter_add_version( + PACKAGE_NAME thrift + VERSION "0.9.2-p2" + URL "https://github.com/hunter-packages/thrift/archive/v0.9.2-p2.tar.gz" + SHA1 "0dba938473a718a547b0f21ad3bd6eda2a2574ac") + hunter_cmake_args(thrift CMAKE_ARGS BUILD_TESTING=OFF BUILD_TUTORIALS=OFF + BUILD_COMPILER=OFF + BUILD_C_GLIB=OFF + BUILD_CPP=ON BUILD_HASKELL=OFF BUILD_JAVA=OFF - BUILD_C_GLIB=OFF + BUILD_PYTHON=OFF WITH_QT4=OFF WITH_QT5=OFF WITH_SHARED_LIB=OFF - WITH_PLUGIN=OFF) + WITH_PLUGIN=OFF + WITH_LIBEVENT=OFF + WITH_OPENSSL=OFF + WITH_ZLIB=OFF) hunter_pick_scheme(DEFAULT url_sha1_cmake) -# Not cachable due to dependency on bison +hunter_cacheable(thrift) hunter_download(PACKAGE_NAME thrift) diff --git a/docs/packages/pkg/thrift.rst b/docs/packages/pkg/thrift.rst index fbcc44bb4d..4adf676177 100644 --- a/docs/packages/pkg/thrift.rst +++ b/docs/packages/pkg/thrift.rst @@ -1,6 +1,10 @@ .. spelling:: + cacheable + SSL thrift + Thrift + toolchain .. index:: serialize ; thrift @@ -14,11 +18,18 @@ thrift - `Example `__ - Added by `isaachier `__ (`pr-1064 `__) +This package **does not** compile the Thrift compiler by default. Nor does it +compile the ``thriftz`` and ``thrifnb`` libraries. It just builds the basic ``thrift`` +library, without SSL support. To compile the Thrift compiler, you must pass in +custom CMake arguments in your toolchain, namely ``BUILD_COMPILER=ON``. +Similarly, to build ``thriftz``, pass ``WITH_ZLIB=ON``. To build ``thriftnb``, +pass ``WITH_LIBEVENT=ON``. To compile with SSL support, pass ``WITH_OPENSSL=ON``. + .. code-block:: cmake hunter_add_package(thrift) find_package(thrift CONFIG REQUIRED) - target_link_libraries(foo - thrift::thrift_static # Main thrift library - thrift::thriftz_static # thrift ZLIB support - thrift::thriftnb_static) # thrift Libevent non-blocking support + target_link_libraries(foo PUBLIC + thrift::thrift # Main thrift library, thrift_static for static library + thrift::thriftz # thrift ZLIB support + thrift::thriftnb) # thrift Libevent non-blocking support From 303c4173c1339c7f324c2fbc6f2adee00a175963 Mon Sep 17 00:00:00 2001 From: dvirtz Date: Thu, 16 Nov 2017 21:59:53 +0200 Subject: [PATCH 0141/1014] mongoose 5.6 --- cmake/projects/mongoose/hunter.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmake/projects/mongoose/hunter.cmake b/cmake/projects/mongoose/hunter.cmake index adc2b252cf..f6a1928278 100644 --- a/cmake/projects/mongoose/hunter.cmake +++ b/cmake/projects/mongoose/hunter.cmake @@ -19,6 +19,17 @@ hunter_add_version( 7f2af8da196c29a60f597b67cde5706d0acb20a0 ) +hunter_add_version( + PACKAGE_NAME + mongoose + VERSION + 5.6 + URL + https://github.com/hunter-packages/mongoose/archive/5.6-p.tar.gz + SHA1 + cbb313403e742f09cbbcf1c1a62c13e156c6b803 +) + hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(mongoose) hunter_download(PACKAGE_NAME mongoose) From 67ebd75b93c07a03503635919cbb63f7c6b85291 Mon Sep 17 00:00:00 2001 From: Isra Basrt0 Date: Fri, 17 Nov 2017 09:26:27 +0100 Subject: [PATCH 0142/1014] New CMAKE_ARGS options for Boost to append config macros to boost config (#1204) Users of Boost can define some configuration macros. This configuration macros can affect non headers only/compiled boost component. To keep the same configuration between compiled boost components and projects that will use those components, configurations macros are append to the default boost user config file (boost/config/user.hpp). Configuration macros can be defined using new CMAKE_ARGS options in hunter_config() for boost. --- cmake/projects/Boost/atomic/hunter.cmake | 2 +- cmake/projects/Boost/chrono/hunter.cmake | 2 +- cmake/projects/Boost/context/hunter.cmake | 2 +- cmake/projects/Boost/coroutine/hunter.cmake | 2 +- cmake/projects/Boost/date_time/hunter.cmake | 2 +- cmake/projects/Boost/exception/hunter.cmake | 2 +- cmake/projects/Boost/filesystem/hunter.cmake | 2 +- cmake/projects/Boost/graph/hunter.cmake | 2 +- .../Boost/graph_parallel/hunter.cmake | 2 +- cmake/projects/Boost/hunter.cmake | 2 +- cmake/projects/Boost/hunter.cmake.in | 2 +- cmake/projects/Boost/iostreams/hunter.cmake | 2 +- cmake/projects/Boost/locale/hunter.cmake | 2 +- cmake/projects/Boost/log/hunter.cmake | 2 +- cmake/projects/Boost/math/hunter.cmake | 2 +- cmake/projects/Boost/mpi/hunter.cmake | 2 +- .../Boost/program_options/hunter.cmake | 2 +- cmake/projects/Boost/python/hunter.cmake | 2 +- cmake/projects/Boost/random/hunter.cmake | 2 +- cmake/projects/Boost/regex/hunter.cmake | 2 +- .../Boost/schemes/url_sha1_boost.cmake.in | 4 +++ .../url_sha1_boost_ios_library.cmake.in | 4 +++ .../schemes/url_sha1_boost_library.cmake.in | 4 +++ .../projects/Boost/serialization/hunter.cmake | 2 +- cmake/projects/Boost/signals/hunter.cmake | 2 +- cmake/projects/Boost/system/hunter.cmake | 2 +- cmake/projects/Boost/test/hunter.cmake | 2 +- cmake/projects/Boost/thread/hunter.cmake | 2 +- cmake/projects/Boost/timer/hunter.cmake | 2 +- cmake/projects/Boost/wave/hunter.cmake | 2 +- docs/packages/pkg/Boost.rst | 34 ++++++++++++++---- scripts/append-boost-config-macros.cmake | 35 +++++++++++++++++++ 32 files changed, 101 insertions(+), 34 deletions(-) create mode 100644 scripts/append-boost-config-macros.cmake diff --git a/cmake/projects/Boost/atomic/hunter.cmake b/cmake/projects/Boost/atomic/hunter.cmake index de03a2f676..c0f315c62a 100644 --- a/cmake/projects/Boost/atomic/hunter.cmake +++ b/cmake/projects/Boost/atomic/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT atomic - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/chrono/hunter.cmake b/cmake/projects/Boost/chrono/hunter.cmake index 5e57637428..b184bd36c0 100644 --- a/cmake/projects/Boost/chrono/hunter.cmake +++ b/cmake/projects/Boost/chrono/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT chrono - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/context/hunter.cmake b/cmake/projects/Boost/context/hunter.cmake index c020c02e95..5c45478737 100644 --- a/cmake/projects/Boost/context/hunter.cmake +++ b/cmake/projects/Boost/context/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT context - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/coroutine/hunter.cmake b/cmake/projects/Boost/coroutine/hunter.cmake index c1bd3bedaa..7550daef3d 100644 --- a/cmake/projects/Boost/coroutine/hunter.cmake +++ b/cmake/projects/Boost/coroutine/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT coroutine - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/date_time/hunter.cmake b/cmake/projects/Boost/date_time/hunter.cmake index de8daead9b..6ab7f4f5ec 100644 --- a/cmake/projects/Boost/date_time/hunter.cmake +++ b/cmake/projects/Boost/date_time/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT date_time - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/exception/hunter.cmake b/cmake/projects/Boost/exception/hunter.cmake index 497c94a3b5..8c8ba6c7be 100644 --- a/cmake/projects/Boost/exception/hunter.cmake +++ b/cmake/projects/Boost/exception/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT exception - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/filesystem/hunter.cmake b/cmake/projects/Boost/filesystem/hunter.cmake index d62ffc2b4b..6d0b9ca386 100644 --- a/cmake/projects/Boost/filesystem/hunter.cmake +++ b/cmake/projects/Boost/filesystem/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT filesystem - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/graph/hunter.cmake b/cmake/projects/Boost/graph/hunter.cmake index c2d8d1be38..d16a5bef12 100644 --- a/cmake/projects/Boost/graph/hunter.cmake +++ b/cmake/projects/Boost/graph/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT graph - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/graph_parallel/hunter.cmake b/cmake/projects/Boost/graph_parallel/hunter.cmake index 54e8293dba..2525efff30 100644 --- a/cmake/projects/Boost/graph_parallel/hunter.cmake +++ b/cmake/projects/Boost/graph_parallel/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT graph_parallel - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/hunter.cmake b/cmake/projects/Boost/hunter.cmake index b206439186..a5f92cb826 100644 --- a/cmake/projects/Boost/hunter.cmake +++ b/cmake/projects/Boost/hunter.cmake @@ -280,4 +280,4 @@ hunter_add_version( hunter_pick_scheme(DEFAULT url_sha1_boost) hunter_cacheable(Boost) -hunter_download(PACKAGE_NAME Boost PACKAGE_INTERNAL_DEPS_ID "17") +hunter_download(PACKAGE_NAME Boost PACKAGE_INTERNAL_DEPS_ID "18") diff --git a/cmake/projects/Boost/hunter.cmake.in b/cmake/projects/Boost/hunter.cmake.in index 596630111d..79add34830 100644 --- a/cmake/projects/Boost/hunter.cmake.in +++ b/cmake/projects/Boost/hunter.cmake.in @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT boost_component - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/iostreams/hunter.cmake b/cmake/projects/Boost/iostreams/hunter.cmake index 38549ff56d..d792ba1606 100644 --- a/cmake/projects/Boost/iostreams/hunter.cmake +++ b/cmake/projects/Boost/iostreams/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT iostreams - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/locale/hunter.cmake b/cmake/projects/Boost/locale/hunter.cmake index 57921e0bfe..cf22048d92 100644 --- a/cmake/projects/Boost/locale/hunter.cmake +++ b/cmake/projects/Boost/locale/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT locale - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/log/hunter.cmake b/cmake/projects/Boost/log/hunter.cmake index f5432ba683..722331ce56 100644 --- a/cmake/projects/Boost/log/hunter.cmake +++ b/cmake/projects/Boost/log/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT log - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/math/hunter.cmake b/cmake/projects/Boost/math/hunter.cmake index dec95b8229..8f38255517 100644 --- a/cmake/projects/Boost/math/hunter.cmake +++ b/cmake/projects/Boost/math/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT math - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/mpi/hunter.cmake b/cmake/projects/Boost/mpi/hunter.cmake index 4c4c6e0d2f..325be28ab9 100644 --- a/cmake/projects/Boost/mpi/hunter.cmake +++ b/cmake/projects/Boost/mpi/hunter.cmake @@ -26,5 +26,5 @@ hunter_download( Boost PACKAGE_COMPONENT mpi - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/program_options/hunter.cmake b/cmake/projects/Boost/program_options/hunter.cmake index f036ae7565..a95189431f 100644 --- a/cmake/projects/Boost/program_options/hunter.cmake +++ b/cmake/projects/Boost/program_options/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT program_options - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/python/hunter.cmake b/cmake/projects/Boost/python/hunter.cmake index 06c786cdd6..2b3a40a75f 100644 --- a/cmake/projects/Boost/python/hunter.cmake +++ b/cmake/projects/Boost/python/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT python - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/random/hunter.cmake b/cmake/projects/Boost/random/hunter.cmake index 2f87231580..80ab675acd 100644 --- a/cmake/projects/Boost/random/hunter.cmake +++ b/cmake/projects/Boost/random/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT random - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/regex/hunter.cmake b/cmake/projects/Boost/regex/hunter.cmake index 2808a0e80f..2b46725b3e 100644 --- a/cmake/projects/Boost/regex/hunter.cmake +++ b/cmake/projects/Boost/regex/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT regex - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in b/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in index fea6f61422..5f1b5bb881 100644 --- a/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in +++ b/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in @@ -100,6 +100,10 @@ ExternalProject_Add( INSTALL_DIR "@HUNTER_PACKAGE_INSTALL_PREFIX@" # not used, just avoid creating Install/ empty directory + UPDATE_COMMAND + "@CMAKE_COMMAND@" -P + "@HUNTER_GLOBAL_SCRIPT_DIR@/append-boost-config-macros.cmake" + "@HUNTER_Boost_CMAKE_ARGS@" CONFIGURE_COMMAND ${env_cmd} COMMAND diff --git a/cmake/projects/Boost/schemes/url_sha1_boost_ios_library.cmake.in b/cmake/projects/Boost/schemes/url_sha1_boost_ios_library.cmake.in index a01f7e56a8..a350e932b7 100644 --- a/cmake/projects/Boost/schemes/url_sha1_boost_ios_library.cmake.in +++ b/cmake/projects/Boost/schemes/url_sha1_boost_ios_library.cmake.in @@ -310,6 +310,10 @@ ExternalProject_Add( INSTALL_DIR "@HUNTER_PACKAGE_INSTALL_PREFIX@" # not used, just avoid creating Install/ empty directory + UPDATE_COMMAND + "@CMAKE_COMMAND@" -P + "@HUNTER_GLOBAL_SCRIPT_DIR@/append-boost-config-macros.cmake" + "@HUNTER_Boost_CMAKE_ARGS@" CONFIGURE_COMMAND "" BUILD_COMMAND diff --git a/cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in b/cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in index bc9939eede..1c4b56305b 100644 --- a/cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in +++ b/cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in @@ -355,6 +355,10 @@ ExternalProject_Add( INSTALL_DIR "@HUNTER_PACKAGE_INSTALL_PREFIX@" # not used, just avoid creating Install/ empty directory + UPDATE_COMMAND + "@CMAKE_COMMAND@" -P + "@HUNTER_GLOBAL_SCRIPT_DIR@/append-boost-config-macros.cmake" + "@HUNTER_Boost_CMAKE_ARGS@" CONFIGURE_COMMAND ${env_cmd} ${copy_mpi_command} diff --git a/cmake/projects/Boost/serialization/hunter.cmake b/cmake/projects/Boost/serialization/hunter.cmake index bb6d45db6d..150a239a56 100644 --- a/cmake/projects/Boost/serialization/hunter.cmake +++ b/cmake/projects/Boost/serialization/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT serialization - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/signals/hunter.cmake b/cmake/projects/Boost/signals/hunter.cmake index 534a253f21..911b7b3fe1 100644 --- a/cmake/projects/Boost/signals/hunter.cmake +++ b/cmake/projects/Boost/signals/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT signals - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/system/hunter.cmake b/cmake/projects/Boost/system/hunter.cmake index caf7bc0774..1291322f14 100644 --- a/cmake/projects/Boost/system/hunter.cmake +++ b/cmake/projects/Boost/system/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT system - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/test/hunter.cmake b/cmake/projects/Boost/test/hunter.cmake index 25b1c4505c..989886b866 100644 --- a/cmake/projects/Boost/test/hunter.cmake +++ b/cmake/projects/Boost/test/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT test - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/thread/hunter.cmake b/cmake/projects/Boost/thread/hunter.cmake index 6671820baf..e51ee8758e 100644 --- a/cmake/projects/Boost/thread/hunter.cmake +++ b/cmake/projects/Boost/thread/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT thread - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/timer/hunter.cmake b/cmake/projects/Boost/timer/hunter.cmake index 6b893c2665..0880cdace3 100644 --- a/cmake/projects/Boost/timer/hunter.cmake +++ b/cmake/projects/Boost/timer/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT timer - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/cmake/projects/Boost/wave/hunter.cmake b/cmake/projects/Boost/wave/hunter.cmake index 54e80626f7..549cc16bf1 100644 --- a/cmake/projects/Boost/wave/hunter.cmake +++ b/cmake/projects/Boost/wave/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT wave - PACKAGE_INTERNAL_DEPS_ID "17" + PACKAGE_INTERNAL_DEPS_ID "18" ) diff --git a/docs/packages/pkg/Boost.rst b/docs/packages/pkg/Boost.rst index 9f07ccb96e..63fe3b8cbc 100644 --- a/docs/packages/pkg/Boost.rst +++ b/docs/packages/pkg/Boost.rst @@ -75,21 +75,41 @@ Compatibility mode CMake options ------------- -CMake options can be passed to boost build using ``CMAKE_ARGS`` feature +You can use ``CMAKE_ARGS`` feature (see -`customization `__). -Options of special form ``_