[lastools] Update to 2.0.2, fix include directories (#29770)

* [lastools] Update to 2.0.2, fix include directories

* [lastools] Updated version database

* [lastools] Replaced deprecated functions

* [lastools] Updated reference, fixed ci.baseline.txt

* [lastools] Updated versions database

* [lastools] Removed port-version from vcpkg.json

* [lastools] Updated version database

* [lastools] Fixed port version

* [lastools] Updated version database

---------

Co-authored-by: Emanuele Trabattoni <Emanuele.Trabattoni@faro.com>
This commit is contained in:
Obbart 2023-02-23 20:19:45 +01:00 коммит произвёл GitHub
Родитель 1afeba9029
Коммит c4c22be7df
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 38 добавлений и 12 удалений

Просмотреть файл

@ -0,0 +1,12 @@
diff --git a/LASlib/src/laslib-config.cmake b/LASlib/src/laslib-config.cmake
index b959a64..eab3466 100644
--- a/LASlib/src/laslib-config.cmake
+++ b/LASlib/src/laslib-config.cmake
@@ -1,6 +1,6 @@
get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
include(${SELF_DIR}/laslib-targets.cmake)
-get_filename_component(LASlib_INCLUDE_DIRS "${SELF_DIR}/../../../include/LASlib" ABSOLUTE)
+get_filename_component(LASlib_INCLUDE_DIRS "${SELF_DIR}/../../include/LASlib" ABSOLUTE)
set_property(TARGET LASlib PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${LASlib_INCLUDE_DIRS})
set(LASlib_FOUND true)

Просмотреть файл

@ -7,19 +7,21 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LAStools/LAStools
REF 7c444a4bbae16fe43c676824a26419bb740a6ab8
SHA512 4503b033a5319caee5570f25a05009c0d05a8c61a43ed78317899faaeba82fbc1f9a8c8433772bb36547c74e850a2e68d20a16f6f22b12b3004da7e1aa2f334b
REF 2bbbfa918df01b7f364d176610e9785bceb4d5de
SHA512 3744aa9e50150261cc3a52272a4cdeafdb4f678a6f6a986a9549c2efead6b4c69bc3d9a6f9f302140ce363d6da965e47b63c0310364307e9caa82c86f75a509f
HEAD_REF master
PATCHES
"fix_install_paths_lastools.patch"
"fix_include_directories_lastools.patch"
)
vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME LASlib CONFIG_PATH "share/lastools/LASlib")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

Просмотреть файл

@ -1,8 +1,17 @@
{
"name": "lastools",
"version-string": "2020-05-09",
"port-version": 1,
"version": "2.0.2+20230206",
"description": "LAStools: award-winning software for efficient LiDAR processing (with LASzip)",
"homepage": "https://github.com/LAStools/LAStools",
"supports": "!uwp"
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

Просмотреть файл

@ -365,8 +365,6 @@ kfr:arm64-windows=fail
kfr:x64-uwp=fail
kfr:arm-uwp=fail
kfr:x64-linux=fail
lastools:arm-uwp=fail
lastools:x64-uwp=fail
lcm:x64-windows-static=fail
lcm:x64-windows-static-md=fail
leptonica:x64-uwp=fail

Просмотреть файл

@ -3633,8 +3633,8 @@
"port-version": 0
},
"lastools": {
"baseline": "2020-05-09",
"port-version": 1
"baseline": "2.0.2+20230206",
"port-version": 0
},
"laszip": {
"baseline": "3.4.3",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ba9574b3fd9117129064d6494b93c3587f2dcf3c",
"version": "2.0.2+20230206",
"port-version": 0
},
{
"git-tree": "6401b05621966caf0aaebc6a4dedb0c696c6c53f",
"version-string": "2020-05-09",