From 4ad26901ec8feeb9e5fad4f85d2f6e5d317e9bd2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 1 Aug 2022 23:05:33 +0200 Subject: [PATCH] [Flann] disable openmp (#26053) * [flann] disable openmp -> requires a feature. * v db --- ports/flann/portfile.cmake | 1 + ports/flann/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flann.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index ce9bb2d3bc..78d4d27695 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_cmake_configure( -DBUILD_DOC=OFF -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_MATLAB_BINDINGS=OFF + -DUSE_OPENMP=OFF OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d ) diff --git a/ports/flann/vcpkg.json b/ports/flann/vcpkg.json index 782fb321b0..ed0622359e 100644 --- a/ports/flann/vcpkg.json +++ b/ports/flann/vcpkg.json @@ -1,7 +1,7 @@ { "name": "flann", "version-date": "2019-04-07", - "port-version": 5, + "port-version": 6, "description": "Fast Library for Approximate Nearest Neighbors", "homepage": "https://github.com/mariusmuja/flann", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 68aa435dcd..5589ac67b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2274,7 +2274,7 @@ }, "flann": { "baseline": "2019-04-07", - "port-version": 5 + "port-version": 6 }, "flash-runtime-extensions": { "baseline": "2.4", diff --git a/versions/f-/flann.json b/versions/f-/flann.json index 71d955c8c6..d951e22e01 100644 --- a/versions/f-/flann.json +++ b/versions/f-/flann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "300415ad416640a5b4a4f0895a3250b306726181", + "version-date": "2019-04-07", + "port-version": 6 + }, { "git-tree": "b31eace0fd51c64ee799affea9ef2127dab68a25", "version-date": "2019-04-07",