From 7b3869f9feed5a55d84c27dccf372be4f054411a Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 25 Oct 2025 01:21:08 +0000 Subject: [PATCH 1/2] Update lastools to v2.0.4 --- packages/l/lastools/xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/l/lastools/xmake.lua b/packages/l/lastools/xmake.lua index c4e6902cd02..1ba2fec85c6 100644 --- a/packages/l/lastools/xmake.lua +++ b/packages/l/lastools/xmake.lua @@ -6,6 +6,7 @@ package("lastools") add_urls("https://github.com/LAStools/LAStools/archive/refs/tags/$(version).tar.gz", "https://github.com/LAStools/LAStools.git") + add_versions("v2.0.4", "40009d74dd7e782e2f245f4e35d063db06e74b2948a47157ee41f1cf63057090") add_versions("v2.0.3", "b6c6ac33835ead2c69d05e282febc266048ba071a71dae6fdad321d532dfcf78") add_configs("cmake", {description = "Use cmake buildsystem", default = false, type = "boolean"}) From bad641301f2f9e932d0b6931ef6bb9845c921ba6 Mon Sep 17 00:00:00 2001 From: star9029 Date: Mon, 27 Oct 2025 17:21:18 +0800 Subject: [PATCH 2/2] Fix installation for MinGW and update CMakeLists --- packages/l/lastools/xmake.lua | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/l/lastools/xmake.lua b/packages/l/lastools/xmake.lua index 1ba2fec85c6..8d800590d23 100644 --- a/packages/l/lastools/xmake.lua +++ b/packages/l/lastools/xmake.lua @@ -22,18 +22,29 @@ package("lastools") end) on_install(function (package) + if package:is_plat("mingw") then + if package:version() and package:version():ge("2.0.4") then + io.replace("LASzip/src/mydefs.cpp", "#ifdef _MSC_VER\n#include ", "#ifdef _WIN32\n#include ", {plain = true}) + io.replace("LASzip/src/mydefs.cpp", "#ifdef _MSC_VER\n GetCurrentDirectory", "#ifdef _WIN32\n GetCurrentDirectory", {plain = true}) + end + end + local enable_tools = package:config("tools") if package:config("cmake") then + io.replace("LASlib/src/CMakeLists.txt", "RUNTIME DESTINATION lib/LASlib", "RUNTIME DESTINATION bin", {plain = true}) + io.replace("LASlib/src/CMakeLists.txt", "DESTINATION lib/LASlib", "DESTINATION lib", {plain = true}) if not enable_tools then io.replace("CMakeLists.txt", "add_subdirectory(src)", "", {plain = true}) end - + local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - + local opt = {} - opt.cxflags = "/utf-8" + if package:has_tool("cxx", "cl") then + opt.cxflags = "/utf-8" + end import("package.tools.cmake").install(package, configs, opt) os.cp("LASlib/lib/*.lib", package:installdir("lib"))