aboutsummaryrefslogtreecommitdiff
path: root/ports/nmslib
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2019-11-22 09:47:40 -0800
committerGitHub <noreply@github.com>2019-11-22 09:47:40 -0800
commit45f4b820e5743b89bca3508ba2028cdd5d8bbd17 (patch)
treef874a8c4a7392309bdbb86447288597ec0a4a281 /ports/nmslib
parent62d67d3bf8eeff1afa8009041fd08b8822676b7b (diff)
parent8831e8f25f1ff6546ee4a5291b91d599421637b3 (diff)
downloadvcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.tar.gz
vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.zip
Merge branch 'master' into vcpkg_nuget
Diffstat (limited to 'ports/nmslib')
-rw-r--r--ports/nmslib/CONTROL2
-rw-r--r--ports/nmslib/portfile.cmake13
2 files changed, 6 insertions, 9 deletions
diff --git a/ports/nmslib/CONTROL b/ports/nmslib/CONTROL
index 262c40682..288fc7377 100644
--- a/ports/nmslib/CONTROL
+++ b/ports/nmslib/CONTROL
@@ -1,5 +1,5 @@
Source: nmslib
-Version: 1.7.3.6
+Version: 1.8.2
Homepage: https://github.com/searchivarius/nmslib
Description: Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.
#
diff --git a/ports/nmslib/portfile.cmake b/ports/nmslib/portfile.cmake
index ffea74d75..d250c0977 100644
--- a/ports/nmslib/portfile.cmake
+++ b/ports/nmslib/portfile.cmake
@@ -5,16 +5,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO nmslib/nmslib
- REF 1eda05dccd5ed34df50a243dfc64c5e9187388f8
- SHA512 e4518c8dd84867bd0ac5dbc5d3b57d8053d1f73588fc0cf1d7c91cc4819f22dc7888d6be587691ebc1fd12b67de16de63b5e0a24847b6f7b49b57d1e6b457ebd
+ REF c9fc0b862f09260b558cf81e94e0d58aca15d9e9
+ SHA512 ac9c79e3ac991dd58f239f7e0b2bd6c3185907aa283bc42098aadddac87b361867f002664cc14853822f92a491d95269578bea01aa00477e39a40424320000a1
HEAD_REF master
-)
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/fix-headers.patch
- ${CMAKE_CURRENT_LIST_DIR}/fix-cmake-order.patch
+ fix-headers.patch
+ fix-cmake-order.patch
)
set(WITH_EXTRAS OFF)
@@ -25,6 +21,7 @@ endif()
# TODO: check SSE and AVX avability and set corresponding tags
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/similarity_search
+ PREFER_NINJA
OPTIONS
-DWITH_EXTRAS=${WITH_EXTRAS}
)