From f1c8fc2cb367b93383b51fa4addc762cc163b330 Mon Sep 17 00:00:00 2001 From: Elite-stay <344233108@qq.com> Date: Thu, 8 Aug 2024 14:48:21 +0800 Subject: [PATCH 1/3] update gdal test --- packages/g/gdal/xmake.lua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/g/gdal/xmake.lua b/packages/g/gdal/xmake.lua index 122f071a64b..0209aff87df 100644 --- a/packages/g/gdal/xmake.lua +++ b/packages/g/gdal/xmake.lua @@ -118,9 +118,5 @@ package("gdal") end) on_test(function (package) - assert(package:check_cxxsnippets({test = [[ - #include - void test(int argc, char** argv) { - GDALAllRegister(); - }]]}, {configs = {languages = "c++11"}, includes = "ogrsf_frmts.h"})) + assert(package:has_cfuncs("GDALAllRegister", {includes = "ogrsf_frmts.h"})) end) From 30af611fafd1510dbfa3c2e6032d0cac7154891b Mon Sep 17 00:00:00 2001 From: star9029 Date: Thu, 8 Aug 2024 17:16:44 +0800 Subject: [PATCH 2/3] Update xmake.lua --- packages/g/gdal/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/g/gdal/xmake.lua b/packages/g/gdal/xmake.lua index 0209aff87df..532a3a06df6 100644 --- a/packages/g/gdal/xmake.lua +++ b/packages/g/gdal/xmake.lua @@ -118,5 +118,5 @@ package("gdal") end) on_test(function (package) - assert(package:has_cfuncs("GDALAllRegister", {includes = "ogrsf_frmts.h"})) + assert(package:has_cxxfuncs("GDALAllRegister", {includes = "ogrsf_frmts.h"})) end) From f31f2913e6fb2325af866193f05ad302d4f19ad3 Mon Sep 17 00:00:00 2001 From: Elite-stay <344233108@qq.com> Date: Thu, 8 Aug 2024 17:42:05 +0800 Subject: [PATCH 3/3] Update xmake.lua --- packages/g/gdal/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/g/gdal/xmake.lua b/packages/g/gdal/xmake.lua index 532a3a06df6..e730d0ac7e3 100644 --- a/packages/g/gdal/xmake.lua +++ b/packages/g/gdal/xmake.lua @@ -118,5 +118,5 @@ package("gdal") end) on_test(function (package) - assert(package:has_cxxfuncs("GDALAllRegister", {includes = "ogrsf_frmts.h"})) + assert(package:has_cxxfuncs("GDALAllRegister", {configs = {languages = "c++11"}, includes = "ogrsf_frmts.h"})) end)