aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchausner <15180557+chausner@users.noreply.github.com>2021-10-06 01:15:09 +0200
committerGitHub <noreply@github.com>2021-10-05 16:15:09 -0700
commit6397f38354fbfade95bd63a9c9a72a977f01598f (patch)
treed0fe251219c599e2a6e2c430cb0ee10fd3efd465
parent64d79c9a9ea6b7eec4dc3116098875b426ac7cbf (diff)
downloadvcpkg-6397f38354fbfade95bd63a9c9a72a977f01598f.tar.gz
vcpkg-6397f38354fbfade95bd63a9c9a72a977f01598f.zip
[edlib] Update to 1.2.7 (#20489)
* Update edlib to 1.2.7 * Update CI baseline * Remove obsolete patch file * Update git-tree hash Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
-rw-r--r--ports/edlib/fix-cmake-install.patch64
-rw-r--r--ports/edlib/portfile.cmake21
-rw-r--r--ports/edlib/vcpkg.json15
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/e-/edlib.json5
5 files changed, 27 insertions, 82 deletions
diff --git a/ports/edlib/fix-cmake-install.patch b/ports/edlib/fix-cmake-install.patch
deleted file mode 100644
index 8081bba78..000000000
--- a/ports/edlib/fix-cmake-install.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 767d808..21f0cfc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -74,14 +74,42 @@ if (NOT WIN32) # If on windows, do not build binaries that do not support window
- target_link_libraries(edlib-aligner edlib)
- endif()
-
--
--# Create target 'install' for installing libraries.
--install(TARGETS edlib DESTINATION ${CMAKE_INSTALL_LIBDIR})
--install(FILES edlib/include/edlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
--
- # configure and install pkg-config file
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/edlib.pc.in
- ${CMAKE_CURRENT_BINARY_DIR}/edlib-1.pc
- @ONLY)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/edlib-1.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+
-+### Additional config for VCPKG
-+include(CMakePackageConfigHelpers)
-+set(EDLIB_CMAKE_DIR "lib/cmake/edlib" CACHE STRING
-+ "Installation directory for cmake files, relative to ${CMAKE_INSTALL_PREFIX}.")
-+set(version_config "${PROJECT_BINARY_DIR}/edlib-config-version.cmake")
-+set(project_config "${PROJECT_BINARY_DIR}/edlib-config.cmake")
-+set(targets_export_name edlib-targets)
-+
-+# Generate the version, config and target files into the build directory.
-+write_basic_package_version_file(
-+ ${version_config}
-+ VERSION ${VERSION}
-+ COMPATIBILITY AnyNewerVersion)
-+configure_package_config_file(
-+ ${PROJECT_SOURCE_DIR}/edlib-config.cmake.in
-+ ${project_config}
-+ INSTALL_DESTINATION ${EDLIB_CMAKE_DIR})
-+export(TARGETS edlib NAMESPACE edlib::
-+ FILE ${PROJECT_BINARY_DIR}/${targets_export_name}.cmake)
-+
-+# Install version, config and target files.
-+install(
-+ FILES ${project_config} ${version_config}
-+ DESTINATION ${EDLIB_CMAKE_DIR})
-+install(EXPORT ${targets_export_name} DESTINATION ${EDLIB_CMAKE_DIR}
-+ NAMESPACE edlib::)
-+
-+### //
-+
-+# Create target 'install' for installing libraries.
-+install(TARGETS edlib EXPORT ${targets_export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES edlib/include/edlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-\ No newline at end of file
-diff --git a/edlib-config.cmake.in b/edlib-config.cmake.in
-new file mode 100644
-index 0000000..f2cc030
---- /dev/null
-+++ b/edlib-config.cmake.in
-@@ -0,0 +1,4 @@
-+@PACKAGE_INIT@
-+
-+include(${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake)
-+check_required_components(edlib)
-\ No newline at end of file
diff --git a/ports/edlib/portfile.cmake b/ports/edlib/portfile.cmake
index 788320015..96fdcc3ba 100644
--- a/ports/edlib/portfile.cmake
+++ b/ports/edlib/portfile.cmake
@@ -1,24 +1,19 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Martinsos/edlib
- REF v1.2.6
- SHA512 75b470c1403113e5f0895b3c1bb4163e65c6e04ccf41a75297a5b4cc915a567567ebcc79f3b9ea74b5e7188adfab2eceda5ac75e2d861aef8b3fefc6d4f39200
+ REF v1.2.7
+ SHA512 720C732C76D0D9ABE28ADCE9972B355864571A2E6CBD2C72C3B4A92E045A99E3A688153865586F7E8B6C90433E2EB1BB024AD0A6E9D4EB4B4D401A160D3F13CE
HEAD_REF master
- PATCHES
- fix-cmake-install.patch
)
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
)
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/edlib)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/edlib)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/edlib/vcpkg.json b/ports/edlib/vcpkg.json
index 1676dd933..4ac50b3bf 100644
--- a/ports/edlib/vcpkg.json
+++ b/ports/edlib/vcpkg.json
@@ -1,7 +1,16 @@
{
"name": "edlib",
- "version-string": "1.2.6",
- "port-version": 1,
+ "version": "1.2.7",
"description": "Lightweight, super fast C/C++ (& Python) library for sequence alignment using edit (Levenshtein) distance.",
- "homepage": "https://github.com/Martinsos/edlib"
+ "homepage": "https://github.com/Martinsos/edlib",
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
+ ]
}
diff --git a/versions/baseline.json b/versions/baseline.json
index 54f5bacd6..9c822f790 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1941,8 +1941,8 @@
"port-version": 1
},
"edlib": {
- "baseline": "1.2.6",
- "port-version": 1
+ "baseline": "1.2.7",
+ "port-version": 0
},
"effects11": {
"baseline": "11.26",
diff --git a/versions/e-/edlib.json b/versions/e-/edlib.json
index 4c87106f1..3ba91696c 100644
--- a/versions/e-/edlib.json
+++ b/versions/e-/edlib.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "bbcb572fded319dcbb790d57132513c35be4a9fa",
+ "version": "1.2.7",
+ "port-version": 0
+ },
+ {
"git-tree": "f1c507cb59e800c53256b3722b862df4ff41dbd6",
"version-string": "1.2.6",
"port-version": 1