Merge pull request qgis#59169 from qgis/fix_untwine_include_dir

m-kuhn · web-flow · commit 0a36a1bce126 · 2024-10-23T11:54:47.000+02:00
Fix missing include dir for untwine
diff --git 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));
diff --git 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
 )

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ set(UNTWINE_INCLUDE_DIRS`
`101`	`101`	`${CMAKE_SOURCE_DIR}/external/untwine/untwine`
`102`	`102`	`${CMAKE_SOURCE_DIR}/external/untwine/epf`
`103`	`103`	`${CMAKE_SOURCE_DIR}/external/untwine/bu`
	`104`	`+ ${CMAKE_SOURCE_DIR}/external/untwine`
`104`	`105`	`${CMAKE_SOURCE_DIR}/untwine/api`
`105`	`106`	`${CMAKE_BINARY_DIR}/untwine`
`106`	`107`	`)`