mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 21:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing/flann: upgrade to 1.9.2

Browse Source
This commit is contained in:
J0WI 2024-04-20 18:38:16 +02:00 committed by Kevin Daudt
parent 15240d6e17
commit 0a820e569e
2 changed files with 15 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
testing/flann/APKBUILD
View File

@ -1,34 +1,35 @@
# Contributor: Bradley J Chambers <brad.chambers@gmail.com>
# Maintainer: Bradley J Chambers <brad.chambers@gmail.com>
pkgname=flann
pkgver=1.9.1
pkgrel=4
pkgver=1.9.2
pkgrel=0
pkgdesc="Fast Library for Approximate Nearest Neighbors"
url="https://github.com/flann-lib/flann"
arch="all"
license="BSD-3-Clause"
# FLANN tests are broken, test data is invalid
options="!check"
makedepends="cmake"
makedepends="cmake samurai lz4-dev hdf5-dev gtest-dev"
subpackages="$pkgname-doc $pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/flann-lib/flann/archive/$pkgver.tar.gz
cmake.patch"
source="$pkgname-$pkgver.tar.gz::https://github.com/flann-lib/flann/archive/$pkgver.tar.gz"
build() {
mkdir build && cd build
cmake .. \
cmake -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=None \
-DBUILD_SHARED_LIBS=ON
make
-DBUILD_SHARED_LIBS=True
cmake --build build
}
check() {
ctest --test-dir build --output-on-failure
}
package() {
make -C build DESTDIR="$pkgdir" install
DESTDIR="$pkgdir" cmake --install build
# Install license files
install -Dm644 "$builddir"/COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
sha512sums="0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 flann-1.9.1.tar.gz
786558070bb50e60f4f133242d9b77ce72d248aaa45012345c1d768cf648d9d083698663c4ba54f63ae301fc2fe09859a32b12ef0bff20c53e45d57b424c9f48 cmake.patch"
sha512sums="
e1235383e4e3919607cd1417738220c1601342dcf908071a6f75039c45116bd558d9f0534be037b1a8ac5b4ba5b0be5b62bf1d96e44911f14b34f73d941addb2 flann-1.9.2.tar.gz
"

68
testing/flann/cmake.patch
View File

@ -1,68 +0,0 @@
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
index 49c53f0..9f19406 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -28,25 +28,25 @@ if (BUILD_CUDA_LIB)
set_property(TARGET flann_cuda_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
endif()
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
- add_library(flann_cpp SHARED "")
- set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
- target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
-
- if (BUILD_CUDA_LIB)
- cuda_add_library(flann_cuda SHARED "")
- set_target_properties(flann_cuda PROPERTIES LINKER_LANGUAGE CXX)
- target_link_libraries(flann_cuda -Wl,-whole-archive flann_cuda_s -Wl,-no-whole-archive)
- set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA)
- # target_link_libraries(flann_cuda cudpp_x86_64)
- endif()
-else()
+#if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
+# add_library(flann_cpp SHARED "")
+# set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
+# target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
+#
+# if (BUILD_CUDA_LIB)
+# cuda_add_library(flann_cuda SHARED "")
+# set_target_properties(flann_cuda PROPERTIES LINKER_LANGUAGE CXX)
+# target_link_libraries(flann_cuda -Wl,-whole-archive flann_cuda_s -Wl,-no-whole-archive)
+# set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA)
+# # target_link_libraries(flann_cuda cudpp_x86_64)
+# endif()
+#else()
add_library(flann_cpp SHARED ${CPP_SOURCES})
if (BUILD_CUDA_LIB)
cuda_add_library(flann_cuda SHARED ${CPP_SOURCES})
set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA)
endif()
-endif()
+#endif()
set_target_properties(flann_cpp PROPERTIES
VERSION ${FLANN_VERSION}
@@ -82,17 +82,17 @@ if (BUILD_C_BINDINGS)
endif()
set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
- add_library(flann SHARED "")
- set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
- target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
- else()
+ #if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
+ # add_library(flann SHARED "")
+ # set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
+ # target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
+ #else()
add_library(flann SHARED ${C_SOURCES})
if(MINGW AND OPENMP_FOUND)
target_link_libraries(flann gomp)
endif()
- endif()
+ #endif()
set_target_properties(flann PROPERTIES
VERSION ${FLANN_VERSION}