From cda50b3ecc8f0b1dcfcffe46c394deaab115aa6c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 10 Sep 2021 23:18:06 +0200 Subject: [David-Haim/concurrencpp] Add new port (#19997) * [David-Haim/concurrencpp] Add new package * Format vcpkg.json * Add baseline * Fix version * Update CI baseline * Revert "Update CI baseline" This reverts commit 8e3ed430f239e50a94a4afaaaee47e0f15998b06. * Add patch to make linkage configurable * Update git-tree hash * Add patch to set -fcoroutines flag * Update git-tree hash * Revert "Update git-tree hash" This reverts commit b3ccdb2c61f705f7802da880fa0659ece5f1a723. * Revert "Add patch to set -fcoroutines flag" This reverts commit a23c736df9d2ca407204ea57bf977932c4704e41. * Revert "Revert "Update CI baseline"" This reverts commit a50ed32a97fb19311cb13807af70cb5a9aa4b793. * Add supports attribute to manifest, disallow dynamic linkage on Windows * Update git-tree hash * Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Fix whitespace * Update git-tree hash * Add vcpkg-cmake dependencies to vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Adapt for version 0.1.3, address suggestions * Update git-tree hash Co-authored-by: chausner Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/concurrencpp/fix-include-path.patch | 13 +++++++++++++ ports/concurrencpp/portfile.cmake | 21 +++++++++++++++++++++ ports/concurrencpp/vcpkg.json | 17 +++++++++++++++++ scripts/ci.baseline.txt | 2 ++ versions/baseline.json | 4 ++++ versions/c-/concurrencpp.json | 9 +++++++++ 6 files changed, 66 insertions(+) create mode 100644 ports/concurrencpp/fix-include-path.patch create mode 100644 ports/concurrencpp/portfile.cmake create mode 100644 ports/concurrencpp/vcpkg.json create mode 100644 versions/c-/concurrencpp.json diff --git a/ports/concurrencpp/fix-include-path.patch b/ports/concurrencpp/fix-include-path.patch new file mode 100644 index 000000000..7b2da1920 --- /dev/null +++ b/ports/concurrencpp/fix-include-path.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 351aa65..ab06584 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ include(CMakePackageConfigHelpers) + include(GNUInstallDirs) + + set(concurrencpp_directory "concurrencpp-${PROJECT_VERSION}") +-set(concurrencpp_include_directory "${CMAKE_INSTALL_INCLUDEDIR}/${concurrencpp_directory}") ++set(concurrencpp_include_directory "${CMAKE_INSTALL_INCLUDEDIR}") + + install(TARGETS concurrencpp + EXPORT concurrencppTargets diff --git a/ports/concurrencpp/portfile.cmake b/ports/concurrencpp/portfile.cmake new file mode 100644 index 000000000..43578ea88 --- /dev/null +++ b/ports/concurrencpp/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO David-Haim/concurrencpp + REF v.0.1.3 + SHA512 2f4530ba93d768a7a1ae14c532c8ef443745e48cceeca8a0e9da9f91633876ae4971caad70eeff9e18c7a45e8cf7c0b7bb79720a62026850244fb2377ad10df7 + HEAD_REF master + PATCHES + fix-include-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/concurrencpp-0.1.3) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/concurrencpp RENAME copyright) diff --git a/ports/concurrencpp/vcpkg.json b/ports/concurrencpp/vcpkg.json new file mode 100644 index 000000000..c4c8482f1 --- /dev/null +++ b/ports/concurrencpp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "concurrencpp", + "version-string": "0.1.3", + "description": "concurrencpp is a tasking library for C++ allowing developers to write highly concurrent applications easily and safely by using tasks, executors and coroutines.", + "homepage": "https://github.com/David-Haim/concurrencpp/", + "supports": "(windows & static) | linux | osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d6bdfcbc9..73ed5b003 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -147,6 +147,8 @@ cmcstl2:x86-windows = skip coin:arm64-windows=fail coin:arm-uwp=fail coin:x64-uwp=fail +concurrencpp:x64-linux=fail +concurrencpp:x64-osx=fail constexpr-contracts:x64-linux=fail coolprop:arm-uwp=fail coolprop:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index b7955aa1b..b45104c5f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1396,6 +1396,10 @@ "baseline": "3.6.4", "port-version": 0 }, + "concurrencpp": { + "baseline": "0.1.3", + "port-version": 0 + }, "concurrentqueue": { "baseline": "1.0.3", "port-version": 0 diff --git a/versions/c-/concurrencpp.json b/versions/c-/concurrencpp.json new file mode 100644 index 000000000..269d3c43f --- /dev/null +++ b/versions/c-/concurrencpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a6aa7450d44761622be41ef803ef3b92c6388f23", + "version-string": "0.1.3", + "port-version": 0 + } + ] +} -- cgit v1.2.3