From e249dfb528731136b66d5fab6c6e00be243cbbbc Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Tue, 21 Mar 2023 03:16:03 +0800 Subject: [PATCH] [lastools] Fix '*.cmake' file name (#29833) * update lastools * update version --------- Co-authored-by: Monica Co-authored-by: Javier Matos Denizac --- ports/lastools/fix_install_paths_lastools.patch | 11 +++++------ ports/lastools/portfile.cmake | 12 +++++------- ports/lastools/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/lastools.json | 5 +++++ 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ports/lastools/fix_install_paths_lastools.patch b/ports/lastools/fix_install_paths_lastools.patch index 10bb34070546f8..8021ed480f03aa 100644 --- a/ports/lastools/fix_install_paths_lastools.patch +++ b/ports/lastools/fix_install_paths_lastools.patch @@ -1,15 +1,15 @@ diff --git a/LASlib/src/CMakeLists.txt b/LASlib/src/CMakeLists.txt -index 1b170bf..b5c40cb 100644 +index 1b170bf..408628c 100644 --- a/LASlib/src/CMakeLists.txt +++ b/LASlib/src/CMakeLists.txt -@@ -99,17 +99,8 @@ if(MSVC) +@@ -99,17 +99,9 @@ if(MSVC) ) endif() -+install(TARGETS LASlib EXPORT LASlib-targets ++install(TARGETS LASlib EXPORT laslib-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${LAS_INCLUDES} DESTINATION include/LASlib) -- + -if (MSVC) - foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} ) - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../lib/${OUTPUTCONFIG} DESTINATION lib/LASlib) @@ -22,6 +22,5 @@ index 1b170bf..b5c40cb 100644 - install(EXPORT laslib-targets DESTINATION lib/cmake/LASlib) - install(FILES ${CMAKE_SOURCE_DIR}/LASlib/src/laslib-config.cmake DESTINATION lib/cmake/LASlib) -endif(MSVC) -+install(EXPORT LASlib-targets DESTINATION share/lastools/LASlib) ++install(EXPORT laslib-targets DESTINATION share/lastools/LASlib) +install(FILES ${CMAKE_SOURCE_DIR}/LASlib/src/laslib-config.cmake DESTINATION share/lastools/LASlib) -\ No newline at end of file diff --git a/ports/lastools/portfile.cmake b/ports/lastools/portfile.cmake index 430741e7c68e58..6004591d1811ca 100644 --- a/ports/lastools/portfile.cmake +++ b/ports/lastools/portfile.cmake @@ -16,20 +16,18 @@ vcpkg_from_github( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME LASlib CONFIG_PATH "share/lastools/LASlib") +vcpkg_cmake_config_fixup(PACKAGE_NAME LASlib CONFIG_PATH share/lastools/LASlib) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) - +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/lastools/vcpkg.json b/ports/lastools/vcpkg.json index aa90ff26edda00..f82307dc1f3f7f 100644 --- a/ports/lastools/vcpkg.json +++ b/ports/lastools/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lastools", "version": "2.0.2+20230206", + "port-version": 1, "description": "LAStools: award-winning software for efficient LiDAR processing (with LASzip)", "homepage": "https://github.com/LAStools/LAStools", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index fd975faf216152..91e0cf5557a47e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3662,7 +3662,7 @@ }, "lastools": { "baseline": "2.0.2+20230206", - "port-version": 0 + "port-version": 1 }, "laszip": { "baseline": "3.4.3", diff --git a/versions/l-/lastools.json b/versions/l-/lastools.json index 10fdd876af7697..ef2ae236c8abed 100644 --- a/versions/l-/lastools.json +++ b/versions/l-/lastools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8eec220c3958c88af0050876e69d8b7f5d3d945", + "version": "2.0.2+20230206", + "port-version": 1 + }, { "git-tree": "ba9574b3fd9117129064d6494b93c3587f2dcf3c", "version": "2.0.2+20230206",