aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2017-08-27 21:32:44 -0700
committerGitHub <noreply@github.com>2017-08-27 21:32:44 -0700
commit965f2fbfe76bae4fa2f5085b1382c4529ad672e7 (patch)
tree9c2973f0385f6b29537cfaf9a581c655a3a2052e
parentaaf7f5b7d79879a507a839d6af05581f788132b2 (diff)
parent8b7298982a9d850fe8f45f820f2b3cba78af46f6 (diff)
downloadvcpkg-965f2fbfe76bae4fa2f5085b1382c4529ad672e7.tar.gz
vcpkg-965f2fbfe76bae4fa2f5085b1382c4529ad672e7.zip
Merge pull request #1715 from codicodi/snappy-1.1.7
[snappy] update to 1.1.7
-rw-r--r--ports/snappy/CONTROL2
-rw-r--r--ports/snappy/portfile.cmake16
2 files changed, 3 insertions, 15 deletions
diff --git a/ports/snappy/CONTROL b/ports/snappy/CONTROL
index 984b00882..287c9235e 100644
--- a/ports/snappy/CONTROL
+++ b/ports/snappy/CONTROL
@@ -1,3 +1,3 @@
Source: snappy
-Version: 1.1.6-be6dc3d
+Version: 1.1.7
Description: A fast compressor/decompressor.
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 7e78a7f1b..f0169c8f2 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/snappy
- REF be6dc3db83c4701e3e79694dcbfd1c3da03b91dd
- SHA512 1e01a925a2c0bab8b9a329d005384e4b620df118317fd8408ea6afdb22278a2710d26b8d51e2ef762798c757a9e01b47db55280ebb84ca290fb88ae5b18d63e3
+ REF 1.1.7
+ SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
HEAD_REF master
)
@@ -16,18 +16,6 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Snappy)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
- foreach(CONF debug release)
- file(READ ${CURRENT_PACKAGES_DIR}/share/snappy/SnappyTargets-${CONF}.cmake CONFIG_FILE)
- string(REPLACE "lib/snappy.dll" "bin/snappy.dll" CONFIG_FILE "${CONFIG_FILE}")
- file(WRITE ${CURRENT_PACKAGES_DIR}/share/snappy/SnappyTargets-${CONF}.cmake "${CONFIG_FILE}")
- endforeach()
- file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
- file(RENAME ${CURRENT_PACKAGES_DIR}/lib/snappy.dll ${CURRENT_PACKAGES_DIR}/bin/snappy.dll)
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/snappy.dll ${CURRENT_PACKAGES_DIR}/debug/bin/snappy.dll)
-endif()
-
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)