Merge pull request #720 from staticlibs/gdal_windows_arm64

Maxxen · web-flow · commit 2f2668d211c0 · 2025-12-02T13:34:41.000+01:00
diff --git a/vcpkg_ports/gdal/duckdb_gdal_windows_static.patch b/vcpkg_ports/gdal/duckdb_gdal_windows_static.patch
@@ -0,0 +1,14 @@
+--- a/gdal.cmake
++++ b/gdal.cmake
+@@ -619,8 +619,10 @@
+ if (MSVC)
+   target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE gcore/Version.rc)
+   source_group("Resource Files" FILES gcore/Version.rc)
+-  if (CMAKE_CL_64)
++  if (CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64)
+     set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
++  elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL ARM64)
++    set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES STATIC_LIBRARY_FLAGS "/machine:arm64")
+   endif ()
+ endif ()
+ 
diff --git a/vcpkg_ports/gdal/portfile.cmake b/vcpkg_ports/gdal/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
         duckdb_gdal_json.patch
         duckdb_gdal_msys.patch
         duckdb_gdal_remove_filehandler.patch
+        duckdb_gdal_windows_static.patch
 )
 # `vcpkg clean` stumbles over one subdir
 file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ vcpkg_from_github(`
`12`	`12`	`duckdb_gdal_json.patch`
`13`	`13`	`duckdb_gdal_msys.patch`
`14`	`14`	`duckdb_gdal_remove_filehandler.patch`
	`15`	`+ duckdb_gdal_windows_static.patch`
`15`	`16`	`)`
`16`	`17`	# `vcpkg clean` stumbles over one subdir
`17`	`18`	`file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")`