diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/stlab | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/stlab')
| -rw-r--r-- | ports/stlab/CONTROL | 5 | ||||
| -rw-r--r-- | ports/stlab/dont-require-testing.patch | 14 | ||||
| -rw-r--r-- | ports/stlab/portfile.cmake | 7 |
3 files changed, 21 insertions, 5 deletions
diff --git a/ports/stlab/CONTROL b/ports/stlab/CONTROL index c1a752a5e..01651f59b 100644 --- a/ports/stlab/CONTROL +++ b/ports/stlab/CONTROL @@ -1,5 +1,6 @@ Source: stlab
-Version: 1.3.3
+Version: 1.4.1
Description:
stlab is the ongoing work of what was Adobe’s 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.
\ No newline at end of file + 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)
\ No newline at end of file diff --git a/ports/stlab/dont-require-testing.patch b/ports/stlab/dont-require-testing.patch new file mode 100644 index 000000000..f5c2106e7 --- /dev/null +++ b/ports/stlab/dont-require-testing.patch @@ -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()
+
diff --git a/ports/stlab/portfile.cmake b/ports/stlab/portfile.cmake index a2bd71e56..7c8925d93 100644 --- a/ports/stlab/portfile.cmake +++ b/ports/stlab/portfile.cmake @@ -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(
|