Skip to content

Commit

Permalink
[stlab] Update to 1.7.1 (#30525)
Browse files Browse the repository at this point in the history
* Update stlab to 1.7.1

* Apply suggestions from code review

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>

* Remove unnecessary closing bracket

* Run vcpkg x-add-version stlab --overwrite-version per @Cheney-W

* Add "shims" feature to port to match cmake expectations

* remove erroneous version object

* Formatting

* Run vcpkg x-add-version stlab --overwrite-version

---------

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
  • Loading branch information
nickpdemarco and Cheney-W authored Apr 6, 2023
1 parent 92acffb commit b7b490a
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 13 deletions.
8 changes: 4 additions & 4 deletions ports/stlab/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO stlab/libraries
REF 0a7232a4120c2daf8ddb6621ec13f313a029e495 # V1.6.2
SHA512 6e03a5370d02accd798fc14fd256ab593b9a33b4a9b9cda8f2233eeafacf70c389c2999d1834b7ffef6968008921d28d88bcf728a322ba7943106ddc9d8e6f16
HEAD_REF develop
REF "v${VERSION}"
SHA512 ceed4fffc381bebd5456d56e8f9d84094da2a9994c8be60e9c1fe4a72ae5f2c398448169927af1439615b55c549332dfe4c38a2b3b8bdf84e3c550fd14bf125c
HEAD_REF main
)

vcpkg_cmake_configure(
Expand All @@ -19,7 +19,7 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/cmake")

vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/stlabConfig.cmake"
"find_dependency(Boost 1.60.0)"
"find_dependency(Boost 1.74.0)"
"if(APPLE)\nfind_dependency(Boost)\nendif()"
)

Expand Down
23 changes: 16 additions & 7 deletions ports/stlab/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
{
"name": "stlab",
"version-string": "1.6.2",
"port-version": 2,
"version": "1.7.1",
"description": [
"stlab is the ongoing work of what was Adobe Software Technology Lab.",
"The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures."
],
"homepage": "https://github.com/stlab/libraries",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-variant",
"platform": "osx"
},
{
"name": "vcpkg-cmake",
"host": true
Expand All @@ -19,5 +16,17 @@
"name": "vcpkg-cmake-config",
"host": true
}
]
],
"default-features": [
"cpp17shims"
],
"features": {
"cpp17shims": {
"description": "Support C++11/14 by polyfilling stlab's use of `optional` and `variant` with boost. On by default.",
"dependencies": [
"boost-optional",
"boost-variant"
]
}
}
}
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -7633,8 +7633,8 @@
"port-version": 0
},
"stlab": {
"baseline": "1.6.2",
"port-version": 2
"baseline": "1.7.1",
"port-version": 0
},
"stormlib": {
"baseline": "2019-05-10",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/stlab.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "82ee8586032e3eb89368644e78fe4a4726a17774",
"version": "1.7.1",
"port-version": 0
},
{
"git-tree": "8e7a8c754181f223c69b2b67ed3cf928db44e4b9",
"version-string": "1.6.2",
Expand Down

0 comments on commit b7b490a

Please sign in to comment.