[stlab] update to v1.4.1 (#6209)

* [stlab] update to v1.4.1

[stlab] update head reference

* [stlab] fix osx build
This commit is contained in:
kyp 2019-04-26 21:28:13 +02:00 committed by Griffin Downs
parent 7b3d86b933
commit dad8307618
3 changed files with 21 additions and 5 deletions

View File

@ -1,5 +1,6 @@
Source: stlab
Version: 1.3.3
Version: 1.4.1
Description:
stlab is the ongoing work of what was Adobes 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.
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.
Build-Depends: boost-variant (osx)

View File

@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d058bbe..260d940 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,8 +123,7 @@ if ( stlab.testing OR stlab.boost_variant OR stlab.boost_optional )
endif()
endif()
-
- if(NOT TARGET Boost::unit_test_framework)
+ if (stlab.testing AND NOT TARGET Boost::unit_test_framework)
message(FATAL_ERROR "Could not find Boost unit test framework.")
endif()

View File

@ -3,9 +3,10 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO stlab/libraries
REF v1.3.3
SHA512 2c0eec5638b40f8285cc3b0d756df619b53ba44421c47713aaf45196100765a31a6aea3c5bedba4fcc44494b74e3f0a919271601e717e7f274fe15beb93f8889
HEAD_REF master
REF v1.4.1
SHA512 e9da6f2c570397842f5e73a681f49c5a77977fda430ec730eed6f19d04161172829b7f1adcafd416f0a3f35ea8717ca14e9b935b5ec8fa423e4951c3ba961c7a
HEAD_REF develop
PATCHES dont-require-testing.patch
)
vcpkg_configure_cmake(