diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-06-24 05:38:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 14:38:14 -0700 |
| commit | 7042764fe156848e2fba8a97faf094c110f9f4ae (patch) | |
| tree | 481623f4e147a92604be5fb4a856b4964c391f1a | |
| parent | c75f0b32a674533c619623dd9fe14b2c5a86b926 (diff) | |
| download | vcpkg-7042764fe156848e2fba8a97faf094c110f9f4ae.tar.gz vcpkg-7042764fe156848e2fba8a97faf094c110f9f4ae.zip | |
[stlab] Fix cmake config file (#11787)
* [stlab] Fix cmake config file
* Update ports/stlab/portfile.cmake
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/stlab/CONTROL | 2 | ||||
| -rw-r--r-- | ports/stlab/portfile.cmake | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ports/stlab/CONTROL b/ports/stlab/CONTROL index b67baa4dd..72521a955 100644 --- a/ports/stlab/CONTROL +++ b/ports/stlab/CONTROL @@ -1,5 +1,5 @@ Source: stlab
-Version: 1.5.2 +Version: 1.5.2-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.
diff --git a/ports/stlab/portfile.cmake b/ports/stlab/portfile.cmake index d8bcbebc8..8fb73df6b 100644 --- a/ports/stlab/portfile.cmake +++ b/ports/stlab/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO stlab/libraries
- REF 2e411dd5c8b7eb096e9eb04c46b569c775b126c6 # V1.5.2 + REF 2e411dd5c8b7eb096e9eb04c46b569c775b126c6 # V1.5.2
SHA512 c0e3f8b7b44a6da9734b44e5693d28b84e75a9d4844e30d26dbc65cbd6673fe7e7a45f329aadf5ac3d1e7ec9b939230d179ed150bcf4c3f3e96a3a96ed04fadb
HEAD_REF develop
)
@@ -17,8 +17,11 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/stlab)
vcpkg_copy_pdbs()
-# cleanup
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/cmake)
-# handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file +file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/stlabConfig.cmake STLAB_CONFIG)
+string(REPLACE "find_dependency(Boost 1.60.0)" "if(APPLE)\nfind_dependency(Boost)\nendif()" STLAB_CONFIG ${STLAB_CONFIG})
+
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/stlabConfig.cmake "${STLAB_CONFIG}")
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|