diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-11-22 09:15:49 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-11-21 17:15:49 -0800 |
| commit | 8d26ea0991844f27b26e710c75bb03a35723783c (patch) | |
| tree | 1ca89a814c6c0ff7b115c458884b2ccad2b35b6e | |
| parent | 96be3cdbc261969c52409cc69953e84caf3d0469 (diff) | |
| download | vcpkg-8d26ea0991844f27b26e710c75bb03a35723783c.tar.gz vcpkg-8d26ea0991844f27b26e710c75bb03a35723783c.zip | |
[stlab]Upgrade to 1.5.1 (#8901)
| -rw-r--r-- | ports/stlab/CONTROL | 4 | ||||
| -rw-r--r-- | ports/stlab/dont-require-testing.patch | 14 | ||||
| -rw-r--r-- | ports/stlab/portfile.cmake | 14 |
3 files changed, 8 insertions, 24 deletions
diff --git a/ports/stlab/CONTROL b/ports/stlab/CONTROL index 6a289c531..86d31f6c7 100644 --- a/ports/stlab/CONTROL +++ b/ports/stlab/CONTROL @@ -1,6 +1,6 @@ Source: stlab
-Version: 1.4.1-1
+Version: 1.5.1
Description:
- stlab is the ongoing work of what was Adobe’s Software Technology Lab.
+ 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.
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 deleted file mode 100644 index f5c2106e7..000000000 --- a/ports/stlab/dont-require-testing.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 2bcb7d102..84dbdd8ad 100644 --- a/ports/stlab/portfile.cmake +++ b/ports/stlab/portfile.cmake @@ -1,12 +1,9 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO stlab/libraries
- REF v1.4.1
- SHA512 e9da6f2c570397842f5e73a681f49c5a77977fda430ec730eed6f19d04161172829b7f1adcafd416f0a3f35ea8717ca14e9b935b5ec8fa423e4951c3ba961c7a
- HEAD_REF develop
- PATCHES dont-require-testing.patch
+ REF 328ef2b423df2aadc7c932bb8d6408406714bf37 # v1.5.1
+ SHA512 d9b89db678b838f9f835a5905ea81b6981cf7481c92635521967d15fc1a2e6e6f7564a7faee6242869295a3ee3179a07cad9c65cc496fb3e009277c2dbcaa6b0
+ HEAD_REF develop
)
vcpkg_configure_cmake(
@@ -17,10 +14,11 @@ vcpkg_configure_cmake( )
vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/stlab)
+vcpkg_copy_pdbs()
# cleanup
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/cmake/stlab ${CURRENT_PACKAGES_DIR}/share/stlab)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/cmake)
# handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/stlab RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file |