From 6785a46c1732d915a724db4430c520e1fb3da5e8 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 22 Oct 2024 12:24:07 +0200 Subject: [PATCH 1/2] Fix missing include dir for untwine --- src/providers/pdal/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/providers/pdal/CMakeLists.txt b/src/providers/pdal/CMakeLists.txt index d4082adc29bb..235f80859eb8 100644 --- a/src/providers/pdal/CMakeLists.txt +++ b/src/providers/pdal/CMakeLists.txt @@ -101,6 +101,7 @@ set(UNTWINE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/external/untwine/untwine ${CMAKE_SOURCE_DIR}/external/untwine/epf ${CMAKE_SOURCE_DIR}/external/untwine/bu + ${CMAKE_SOURCE_DIR}/external/untwine ${CMAKE_SOURCE_DIR}/untwine/api ${CMAKE_BINARY_DIR}/untwine ) From 0215bd00343d4b25a9cb5b8533b4581cce5dfc74 Mon Sep 17 00:00:00 2001 From: uclaros Date: Wed, 23 Oct 2024 09:27:32 +0300 Subject: [PATCH 2/2] Apply fix from 8a94723 --- external/untwine/api/QgisUntwine_win.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/untwine/api/QgisUntwine_win.cpp b/external/untwine/api/QgisUntwine_win.cpp index d837a35be1ca..79ab868b09a3 100644 --- a/external/untwine/api/QgisUntwine_win.cpp +++ b/external/untwine/api/QgisUntwine_win.cpp @@ -28,7 +28,7 @@ bool QgisUntwine::start(Options& options) cmdline += "--" + op.first + " \"" + op.second + "\" "; PROCESS_INFORMATION processInfo; - STARTUPINFO startupInfo; + STARTUPINFOA startupInfo; ZeroMemory(&processInfo, sizeof(PROCESS_INFORMATION)); ZeroMemory(&startupInfo, sizeof(STARTUPINFO));