diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-09-27 18:26:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 18:26:08 -0700 |
| commit | 3856a6bda776c454c02760c7d4df4b355a3cc7eb (patch) | |
| tree | 1e4e205eee54138667bf6110e1b26926256c5181 /ports/aws-checksums | |
| parent | 741c8cbecde77f771f8c05f00f59a436a2b4213b (diff) | |
| download | vcpkg-3856a6bda776c454c02760c7d4df4b355a3cc7eb.tar.gz vcpkg-3856a6bda776c454c02760c7d4df4b355a3cc7eb.zip | |
[aws-c-*] Update version (#13558)
* [many ports] Update version
* [aws-checksums] Add dependency aws-c-common
* update version
* port updates
* port updates
* Update ports/brotli/CONTROL
* [draco] fix uwp build
* [blosc] Fix win static build
* [blosc] fix unix build
* move changes to other PRs
* Remove unuse patches
Diffstat (limited to 'ports/aws-checksums')
| -rw-r--r-- | ports/aws-checksums/CONTROL | 3 | ||||
| -rw-r--r-- | ports/aws-checksums/fix-cmake-target-path.patch | 24 | ||||
| -rw-r--r-- | ports/aws-checksums/portfile.cmake | 8 |
3 files changed, 19 insertions, 16 deletions
diff --git a/ports/aws-checksums/CONTROL b/ports/aws-checksums/CONTROL index edbf6a40d..79a420c09 100644 --- a/ports/aws-checksums/CONTROL +++ b/ports/aws-checksums/CONTROL @@ -1,3 +1,4 @@ Source: aws-checksums
-Version: 0.1.5
+Version: 0.1.9 Description: Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.
+Build-Depends: aws-c-common
\ No newline at end of file diff --git a/ports/aws-checksums/fix-cmake-target-path.patch b/ports/aws-checksums/fix-cmake-target-path.patch index ee740a688..101a5379f 100644 --- a/ports/aws-checksums/fix-cmake-target-path.patch +++ b/ports/aws-checksums/fix-cmake-target-path.patch @@ -1,25 +1,25 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2ae2229..c4d0c2d 100644 +index 888742b..efdd817 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -138,7 +138,7 @@ else() +@@ -140,7 +140,7 @@ else() endif() - install(EXPORT "${CMAKE_PROJECT_NAME}-targets" -- DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/" -+ DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/" - NAMESPACE AWS::) + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) - configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake" diff --git a/cmake/aws-checksums-config.cmake b/cmake/aws-checksums-config.cmake -index f0785bf..1b9b2d2 100644 +index 6de2e44..84d55d1 100644 --- a/cmake/aws-checksums-config.cmake +++ b/cmake/aws-checksums-config.cmake -@@ -1,6 +1 @@ +@@ -1,6 +1,2 @@ -if (BUILD_SHARED_LIBS) -- include(${CMAKE_CURRENT_LIST_DIR}/shared/@CMAKE_PROJECT_NAME@-targets.cmake) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) -else() -- include(${CMAKE_CURRENT_LIST_DIR}/static/@CMAKE_PROJECT_NAME@-targets.cmake) +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) -endif() -- +include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/ports/aws-checksums/portfile.cmake b/ports/aws-checksums/portfile.cmake index 081278ea8..86ed6f24f 100644 --- a/ports/aws-checksums/portfile.cmake +++ b/ports/aws-checksums/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-checksums
- REF 519d6d9093819b6cf89ffff589a27ef8f83d0f65 # v0.1.5
- SHA512 3079786d106b98ba3b8c254c26ec4d9accf5fba5bcc13aed30ffa897e17ea7d701e6b6e903b37534e32e1cf0cac3e9a6ff46e1340ed7c530c2fc6262b245e05c
+ REF fb96b3e964fe9bde2625c3ac9547e54d6c802211 # v0.1.9 + SHA512 2cf63a462c900fae8ad101ecac8be6fd6ce3f796e3cecc1b3d19ffba364030d7468a7c7beab91594d2521cab5e99765c7b67fa2fef6f772457e04f75f59962cc
HEAD_REF master
PATCHES fix-cmake-target-path.patch
)
@@ -16,7 +16,9 @@ endif() vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS -DSTATIC_CRT=${STATIC_CRT_LNK}
+ OPTIONS
+ -DSTATIC_CRT=${STATIC_CRT_LNK}
+ -DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common # use extra cmake files
)
vcpkg_install_cmake()
|