浏览代码

itk: update to 5.4.4 (#7753)

* itk: update to 5.4.4

* fix windows MT/MTd

* fix linux

* fix windows arm

* fix windows arm

* use external hdf5

* fix hdf5[cpp]

* fix hdf5 links in windows

* limit itk on windows arm, fix hdf5 windows links

* fix hdf5 shared deps

* clean redundant code

* Update xmake.lua
choyy 1 月之前
父节点
当前提交
8912617571
共有 3 个文件被更改,包括 48 次插入5 次删除
  1. 7 0
      packages/h/hdf5/xmake.lua
  2. 22 0
      packages/i/itk/patch/linux.patch
  3. 19 5
      packages/i/itk/xmake.lua

+ 7 - 0
packages/h/hdf5/xmake.lua

@@ -37,6 +37,13 @@ package("hdf5")
         if package:config("szip") then
         if package:config("szip") then
             package:add("deps", "szip")
             package:add("deps", "szip")
         end
         end
+        if package:config("cpplib") then -- make sure link order is correct
+            local libs = {"hdf5_cpp", "hdf5_hl_cpp", "hdf5_hl", "hdf5_tools", "hdf5"}
+            local prefix = (package:is_plat("windows") and not package:config("shared")) and "lib" or ""
+            for _, lib in ipairs(libs) do
+                package:add("links", prefix .. lib)
+            end
+        end
     end)
     end)
     on_install("windows", "macosx", "linux", function (package)
     on_install("windows", "macosx", "linux", function (package)
         local configs = {
         local configs = {

+ 22 - 0
packages/i/itk/patch/linux.patch

@@ -0,0 +1,22 @@
+diff --git a/Modules/ThirdParty/MINC/src/libminc/libcommon/ParseArgv.c b/Modules/ThirdParty/MINC/src/libminc/libcommon/ParseArgv.c
+index 260f574..15d80dd 100644
+--- a/Modules/ThirdParty/MINC/src/libminc/libcommon/ParseArgv.c
++++ b/Modules/ThirdParty/MINC/src/libminc/libcommon/ParseArgv.c
+@@ -315,7 +315,7 @@ ParseArgv(argcPtr, argv, argTable, flags)
+          }
+          break;
+       case ARGV_FUNC: {
+-         int (*handlerProc)() =  (int (*)())(uintptr_t)infoPtr->src;
++         int (*handlerProc)(void *, const char *, char *) = (int (*)(void *, const char *, char *))(uintptr_t)infoPtr->src;
+ 		
+          if ((*handlerProc)(infoPtr->dst, infoPtr->key,
+                             argv[srcIndex])) {
+@@ -325,7 +325,7 @@ ParseArgv(argcPtr, argv, argTable, flags)
+          break;
+       }
+       case ARGV_GENFUNC: {
+-         int (*handlerProc)() = (int (*)())(uintptr_t)infoPtr->src;
++         int (*handlerProc)(void *, const char *, int, char **) = (int (*)(void *, const char *, int, char **))(uintptr_t)infoPtr->src;
+ 
+          argc = (*handlerProc)(infoPtr->dst, infoPtr->key,
+                                argc, argv+srcIndex);

+ 19 - 5
packages/i/itk/xmake.lua

@@ -7,36 +7,50 @@ package("itk")
     add_urls("https://github.com/InsightSoftwareConsortium/ITK/releases/download/v$(version)/InsightToolkit-$(version).tar.gz")
     add_urls("https://github.com/InsightSoftwareConsortium/ITK/releases/download/v$(version)/InsightToolkit-$(version).tar.gz")
     add_versions("5.2.0", "12c9cf543cbdd929330322f0a704ba6925a13d36d01fc721a74d131c0b82796e")
     add_versions("5.2.0", "12c9cf543cbdd929330322f0a704ba6925a13d36d01fc721a74d131c0b82796e")
     add_versions("5.2.1", "192d41bcdd258273d88069094f98c61c38693553fd751b54f8cda308439555db")
     add_versions("5.2.1", "192d41bcdd258273d88069094f98c61c38693553fd751b54f8cda308439555db")
+    add_versions("5.4.4", "d2092cd018a7b9d88e8c3dda04acb7f9345ab50619b79800688c7bc3afcca82a")
 
 
     add_deps("cmake", "eigen")
     add_deps("cmake", "eigen")
     if is_plat("windows") then
     if is_plat("windows") then
         add_syslinks("shell32", "advapi32")
         add_syslinks("shell32", "advapi32")
     elseif is_plat("linux") then
     elseif is_plat("linux") then
+        add_extsources("apt::libinsighttoolkit5-dev", "pacman::itk")
+        add_patches("5.4.4", "patch/linux.patch", "e3971fb669bc20135310d912dd7272ce038a4745f35e21dec6e1e676a5045b94")
         add_syslinks("dl", "pthread")
         add_syslinks("dl", "pthread")
+    elseif is_plat("mingw") and is_subhost("msys") then
+        add_extsources("pacman::itk")
     end
     end
+
     on_load("windows", "linux", "macosx", function (package)
     on_load("windows", "linux", "macosx", function (package)
         local ver = package:version():major() .. "." .. package:version():minor()
         local ver = package:version():major() .. "." .. package:version():minor()
         package:add("includedirs", "include/ITK-" .. ver)
         package:add("includedirs", "include/ITK-" .. ver)
-        local libs = {"ITKWatersheds", "ITKVideoIO", "ITKVideoCore", "ITKVTK", "ITKTestKernel", "ITKRegistrationMethodsv4", "ITKRegionGrowing", "ITKQuadEdgeMeshFiltering", "ITKOptimizersv4", "ITKMarkovRandomFieldsClassifiers", "itklbfgs", "ITKKLMRegionGrowing", "ITKIOVTK", "ITKIOTransformMatlab", "ITKIOTransformInsightLegacy", "ITKIOTransformHDF5", "ITKIOTransformBase", "ITKTransformFactory", "ITKIOStimulate", "ITKIOSpatialObjects", "ITKIOXML", "ITKIOSiemens", "ITKIOPNG", "itkpng", "ITKIONRRD", "ITKNrrdIO", "ITKIONIFTI", "ITKIOMeta", "ITKIOMeshVTK", "ITKIOMeshOFF", "ITKIOMeshOBJ", "ITKIOMeshGifti", "ITKIOMeshFreeSurfer", "ITKIOMeshBYU", "ITKIOMeshBase", "ITKIOMRC", "ITKIOMINC", "itkminc2", "ITKIOLSM", "ITKIOTIFF", "itktiff", "ITKIOJPEG2000", "itkopenjpeg", "ITKIOJPEG", "itkjpeg", "ITKIOHDF5", "ITKIOGIPL", "ITKIOGE", "ITKIOIPL", "ITKIOGDCM", "ITKIOCSV", "ITKIOBruker", "ITKIOBioRad", "ITKIOBMP", "hdf5-static", "hdf5_cpp-static", "ITKPDEDeformableRegistration", "ITKgiftiio", "ITKniftiio", "ITKznz", "gdcmMSFF", "gdcmDICT", "ITKEXPAT", "ITKDiffusionTensorImage", "ITKDenoising", "ITKDeformableMesh", "ITKDICOMParser", "ITKConvolution", "ITKFFT", "ITKColormap", "ITKBiasCorrection", "ITKPolynomials", "ITKOptimizers", "ITKImageFeature", "ITKSmoothing", "ITKIOImageBase", "ITKFastMarching", "ITKQuadEdgeMesh", "ITKMathematicalMorphology", "ITKLabelMap", "ITKPath", "ITKSpatialObjects", "ITKMetaIO", "itkzlib", "ITKMesh", "ITKTransform", "ITKStatistics", "itkNetlibSlatec", "ITKCommon", "itkvcl", "itkvnl_algo", "itkvnl", "itkv3p_netlib", "itksys", "itkdouble-conversion"}
+        local libs = {"ITKWatersheds", "ITKVideoIO", "ITKVideoCore", "ITKVTK", "ITKTestKernel", "ITKRegistrationMethodsv4", "ITKRegionGrowing", "ITKQuadEdgeMeshFiltering", "ITKOptimizersv4", "ITKMarkovRandomFieldsClassifiers", "itklbfgs", "ITKKLMRegionGrowing", "ITKIOVTK", "ITKIOTransformMatlab", "ITKIOTransformInsightLegacy", "ITKIOTransformHDF5", "ITKIOTransformBase", "ITKTransformFactory", "ITKIOStimulate", "ITKIOSpatialObjects", "ITKIOXML", "ITKIOSiemens", "ITKIOPNG", "itkpng", "ITKIONRRD", "ITKNrrdIO", "ITKIONIFTI", "ITKIOMeta", "ITKIOMeshVTK", "ITKIOMeshOFF", "ITKIOMeshOBJ", "ITKIOMeshGifti", "ITKIOMeshFreeSurfer", "ITKIOMeshBYU", "ITKIOMeshBase", "ITKIOMRC", "ITKIOMINC", "itkminc2", "ITKIOLSM", "ITKIOTIFF", "itktiff", "ITKIOJPEG2000", "itkopenjpeg", "ITKIOJPEG", "itkjpeg", "ITKIOHDF5", "ITKIOGIPL", "ITKIOGE", "ITKIOIPL", "ITKIOGDCM", "ITKIOCSV", "ITKIOBruker", "ITKIOBioRad", "ITKIOBMP", "ITKPDEDeformableRegistration", "ITKgiftiio", "ITKniftiio", "ITKznz", "gdcmMSFF", "gdcmDICT", "ITKEXPAT", "ITKDiffusionTensorImage", "ITKDenoising", "ITKDeformableMesh", "ITKDICOMParser", "ITKConvolution", "ITKFFT", "ITKColormap", "ITKBiasCorrection", "ITKPolynomials", "ITKOptimizers", "ITKImageFeature", "ITKSmoothing", "ITKIOImageBase", "ITKFastMarching", "ITKQuadEdgeMesh", "ITKMathematicalMorphology", "ITKLabelMap", "ITKPath", "ITKSpatialObjects", "ITKMetaIO", "itkzlib", "ITKMesh", "ITKTransform", "ITKStatistics", "itkNetlibSlatec", "ITKCommon", "itkvcl", "itkvnl_algo", "itkvnl", "itkv3p_netlib", "itksys", "itkdouble-conversion"}
         for _, lib in ipairs(libs) do
         for _, lib in ipairs(libs) do
             package:add("links", lib .. "-" .. ver)
             package:add("links", lib .. "-" .. ver)
         end
         end
+        if package:is_plat("windows", "macosx") and package:config("shared") then
+            package:add("deps", "hdf5", {configs = {shared = true, cpplib = true}})
+        else
+            package:add("deps", "hdf5", {configs = {cpplib = true}})
+        end
     end)
     end)
 
 
-    on_install("windows", "linux", "macosx", function (package)
+    on_install("windows|!arm64", "linux", "macosx", function (package)
         local configs = {"-DITK_SKIP_PATH_LENGTH_CHECKS=ON",
         local configs = {"-DITK_SKIP_PATH_LENGTH_CHECKS=ON",
                          "-DBUILD_TESTING=OFF",
                          "-DBUILD_TESTING=OFF",
                          "-DBUILD_EXAMPLES=OFF",
                          "-DBUILD_EXAMPLES=OFF",
                          "-DITK_WRAPPING=OFF",
                          "-DITK_WRAPPING=OFF",
                          "-DITK_USE_SYSTEM_EIGEN=ON",
                          "-DITK_USE_SYSTEM_EIGEN=ON",
-                         "-DCMAKE_CXX_STANDARD=14"}
+                         "-DITK_USE_SYSTEM_HDF5=ON",
+        }
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
+        table.insert(configs, "-DCMAKE_CXX_STANDARD=" .. (package:version():ge("5.4.0") and "17" or "14"))
         if package:config("pic") ~= false then
         if package:config("pic") ~= false then
             table.insert(configs, "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
             table.insert(configs, "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
         end
         end
         if package:is_plat("windows") then
         if package:is_plat("windows") then
-            import("package.tools.cmake").install(package, configs, {buildir = path.join(os.tmpdir(), "itk_build")})
+            table.insert(configs, "-DITK_MSVC_STATIC_RUNTIME_LIBRARY=" .. (package:has_runtime("MT", "MTd") and "ON" or "OFF"))
+            import("package.tools.cmake").install(package, configs, {builddir = path.join(os.tmpdir(), "itk_build")})
         else
         else
             import("package.tools.cmake").install(package, configs)
             import("package.tools.cmake").install(package, configs)
         end
         end
@@ -48,5 +62,5 @@ package("itk")
                 using ImageType = itk::Image<unsigned short, 3>;
                 using ImageType = itk::Image<unsigned short, 3>;
                 ImageType::Pointer image = ImageType::New();
                 ImageType::Pointer image = ImageType::New();
             }
             }
-        ]]}, {configs = {languages = "c++14"}, includes = "itkImage.h"}))
+        ]]}, {configs = {languages = (package:version():ge("5.4.0") and "c++17" or "c++14")}, includes = "itkImage.h"}))
     end)
     end)