Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[parallel-hashmap] Update to current 1.23 version and include natvis file. #6917

Merged
merged 5 commits into from
Jun 17, 2019
Merged

[parallel-hashmap] Update to current 1.23 version and include natvis file. #6917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3b5353
Merge remote-tracking branch 'upstream/master'
greg7mdp Apr 12, 2019
3a24006
update parallel_hashmap version
greg7mdp Apr 12, 2019
6564343
Update portfile.cmake
greg7mdp Jun 16, 2019
f6f921e
Update CONTROL
greg7mdp Jun 16, 2019
2723fe4
Merge remote-tracking branch 'upstream/master'
greg7mdp Jun 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/parallel-hashmap/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: parallel-hashmap
Version: 1.22
Description: A header-only, very fast and memory-friendly hash map family.
Version: 1.23
Description: A header-only, very fast and memory-friendly family of C++ hash maps.
6 changes: 4 additions & 2 deletions ports/parallel-hashmap/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO greg7mdp/parallel-hashmap
REF 1.22
SHA512 930ad0a2fd95310bd2d99c858a09416ca1c02bb823a49f96ec38cfc9ec4029b95b3dc3eacff88dc93df2cad968008b2db3cbb1c458c6cceddc542bb0ca74fad9
REF 1.23
SHA512 efdc717d965292949dc47c2614d97274d52e409a70b283d2b12a957bf3135c6682ed6f77a5b130b70f77eb2cc5c522626cc4b08cd792a7037844df5ba1538985
HEAD_REF master
)

Expand All @@ -19,6 +19,8 @@ vcpkg_install_cmake()
# Delete redundant directories
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/doc)

file(COPY ${SOURCE_PATH}/phmap.natvis DESTINATION ${CURRENT_PACKAGES_DIR}/include)

# Put the licence file where vcpkg expects it
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/parallel-hashmap)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/parallel-hashmap/LICENSE ${CURRENT_PACKAGES_DIR}/share/parallel-hashmap/copyright)