Skip to content

Commit

Permalink
[stlab] Fix cmake config file (#11787)
Browse files Browse the repository at this point in the history
* [stlab] Fix cmake config file

* Update ports/stlab/portfile.cmake

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
  • Loading branch information
PhoebeHui and BillyONeal committed Jun 23, 2020
1 parent c75f0b3 commit 7042764
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ports/stlab/CONTROL
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
11 changes: 7 additions & 4 deletions ports/stlab/portfile.cmake
Original file line number Diff line number Diff line change
@@ -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
)
Expand All @@ -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)
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)

0 comments on commit 7042764

Please sign in to comment.