diff --git a/ports/nanoflann/portfile.cmake b/ports/nanoflann/portfile.cmake index cd295d76d8..81a9fd1120 100644 --- a/ports/nanoflann/portfile.cmake +++ b/ports/nanoflann/portfile.cmake @@ -1,19 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jlblancoc/nanoflann - REF v1.3.2 - SHA512 937D3787DF389EFE530060CD2723130251E2CA7937B10F8D770C7B0D21FFD972E6DA21B2B9E655C5740D57B4AF8F76F0CC6D9AE39527C440BE8863BE0DEAA7ED + REF v1.4.2 + SHA512 2a400725940868473d376635f67aac4402046d771ecceec547442dd653f0a00e38e340e4ac0a98620ddf3927845df18b6cfd644982f073d26c7864bed2de96ca HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNANOFLANN_BUILD_EXAMPLES=OFF + -DNANOFLANN_BUILD_TESTS=OFF ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/${PORT}/cmake") +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_pkgconfig() diff --git a/ports/nanoflann/vcpkg.json b/ports/nanoflann/vcpkg.json index cdf0b0cf02..c24954f216 100644 --- a/ports/nanoflann/vcpkg.json +++ b/ports/nanoflann/vcpkg.json @@ -1,9 +1,9 @@ { "name": "nanoflann", - "version": "1.3.2", - "port-version": 1, + "version": "1.4.2", "description": "nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups).", "homepage": "https://github.com/jlblancoc/nanoflann", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index dc7d7dda60..6e5da63137 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4741,8 +4741,8 @@ "port-version": 6 }, "nanoflann": { - "baseline": "1.3.2", - "port-version": 1 + "baseline": "1.4.2", + "port-version": 0 }, "nanogui": { "baseline": "2019-09-23", diff --git a/versions/n-/nanoflann.json b/versions/n-/nanoflann.json index cda02d8a58..6145f412d8 100644 --- a/versions/n-/nanoflann.json +++ b/versions/n-/nanoflann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59c3e1998e35dcf6648c1775b19e40c5017b2c84", + "version": "1.4.2", + "port-version": 0 + }, { "git-tree": "481ec544fb82ec73f6f0e01d1333f412d3e82d2d", "version": "1.3.2",