diff options
| author | chausner <15180557+chausner@users.noreply.github.com> | 2021-10-05 02:14:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 17:14:16 -0700 |
| commit | 83261448a0d4679f0bb191d533fd3a3087a5b199 (patch) | |
| tree | cbd417b1035db0517d48e62336ad268c7e50803e | |
| parent | a51ecd8e48cc7647d003ba616b7a16f21da1cbd8 (diff) | |
| download | vcpkg-83261448a0d4679f0bb191d533fd3a3087a5b199.tar.gz vcpkg-83261448a0d4679f0bb191d533fd3a3087a5b199.zip | |
[nanoflann] Update to 1.3.2 (#20494)
* Update nanoflann to 1.3.2
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
| -rw-r--r-- | ports/nanoflann/portfile.cmake | 15 | ||||
| -rw-r--r-- | ports/nanoflann/vcpkg.json | 15 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/n-/nanoflann.json | 5 |
4 files changed, 26 insertions, 13 deletions
diff --git a/ports/nanoflann/portfile.cmake b/ports/nanoflann/portfile.cmake index 20c372cd1..0d047c9b6 100644 --- a/ports/nanoflann/portfile.cmake +++ b/ports/nanoflann/portfile.cmake @@ -1,19 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jlblancoc/nanoflann - REF e8792e464ab05267216acde8b4ddf301714176a2 #1.3.1 - SHA512 78a04d39b418b6c6582e6d4180958bb0b492547a9662026da07a8b75d7186140bc4d6b50b6eece32db0196607cfcc901aaf4b458e9ab8a9a115b569acc2bae40 + REF v1.3.2 + SHA512 937D3787DF389EFE530060CD2723130251E2CA7937B10F8D770C7B0D21FFD972E6DA21B2B9E655C5740D57B4AF8F76F0CC6D9AE39527C440BE8863BE0DEAA7ED HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT} TARGET_PATH share/${PORT}) +vcpkg_cmake_install() +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)
\ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file diff --git a/ports/nanoflann/vcpkg.json b/ports/nanoflann/vcpkg.json index 1c9afca8b..e8ca03b60 100644 --- a/ports/nanoflann/vcpkg.json +++ b/ports/nanoflann/vcpkg.json @@ -1,7 +1,16 @@ { "name": "nanoflann", - "version-string": "1.3.1", - "port-version": 1, + "version": "1.3.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" + "homepage": "https://github.com/jlblancoc/nanoflann", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 0aef0b4f0..fc6d1374f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4493,8 +4493,8 @@ "port-version": 4 }, "nanoflann": { - "baseline": "1.3.1", - "port-version": 1 + "baseline": "1.3.2", + "port-version": 0 }, "nanogui": { "baseline": "2019-09-23", diff --git a/versions/n-/nanoflann.json b/versions/n-/nanoflann.json index df5aec220..a62b9a897 100644 --- a/versions/n-/nanoflann.json +++ b/versions/n-/nanoflann.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "d9c4ef40eda67ef94cca10e5a50ac679ac0a34ad", + "version": "1.3.2", + "port-version": 0 + }, + { "git-tree": "256c8df02e530498eeb951b7760d5988d22615eb", "version-string": "1.3.1", "port-version": 1 |