diff options
| author | Dženan Zukić <dzenan.zukic@kitware.com> | 2019-04-02 23:35:44 -0400 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-04-02 20:35:44 -0700 |
| commit | 641e1cd53db09305530130c78ef2b473a52682a1 (patch) | |
| tree | d9324ac33ce410ec5baee28a123f9224e6a4bfe1 /ports/itk | |
| parent | 0fffb47ed02507aeacc29c64d91e9d4639f981f6 (diff) | |
| download | vcpkg-641e1cd53db09305530130c78ef2b473a52682a1.tar.gz vcpkg-641e1cd53db09305530130c78ef2b473a52682a1.zip | |
Fix double-conversion issue in ITK (#5115)
* Using newer version of ITK which fixes double-conversion problem
* Minor style update of ITK portfile
* Using newer version of ITK which fixes double-conversion problem
* [itk] Improve version string
* [itk][hdf5] Update ITK commit. Depend on eigen3. Bump hdf5 control version.
* [hdf5] Update CONTROL
* [netcdf-c] Disable parallel configure due to writes to source directory
* [hdf5] Disable parallel configure due to writes to source directory. Switch to tar.gz to prevent CRLF line endings.
Diffstat (limited to 'ports/itk')
| -rw-r--r-- | ports/itk/CONTROL | 4 | ||||
| -rw-r--r-- | ports/itk/portfile.cmake | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/ports/itk/CONTROL b/ports/itk/CONTROL index 2957c8742..79df1234e 100644 --- a/ports/itk/CONTROL +++ b/ports/itk/CONTROL @@ -1,7 +1,7 @@ Source: itk -Version: 4.13.0-2 +Version: 4.13.0-906736bd Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis. -Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, hdf5[cpp] +Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp] Feature: vtk Description: Build ITKVtkGlue module. diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index 6d0445caf..77a62ac2a 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -3,16 +3,15 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO InsightSoftwareConsortium/ITK - REF d92873e33e8a54e933e445b92151191f02feab42 - SHA512 0e3ebd27571543e1c497377dd9576a9bb0711129be12131109fe9b3c8413655ad14ce4d9ac6e281bac83c57e6032b614bc9ff53ed357d831544ca52f41513b62 + REF 906736bd453e95ccf03b318d3d07cb7884285161 + SHA512 8ac62262d46e7acbb0e5b2e964292ec17e1687bb162b8cec666e5b67acbe3449f093a0b1c03737e9951cb88248ed890805ffd57df6eae21220488620da833c57 HEAD_REF master - PATCHES hdf5_config_mode_find_package.patch ) if ("vtk" IN_LIST FEATURES) - set(ITKVtkGlue ON ) + set(ITKVtkGlue ON) else() - set(ITKVtkGlue OFF ) + set(ITKVtkGlue OFF) endif() # directory path length needs to be shorter than 50 characters @@ -45,6 +44,7 @@ vcpkg_configure_cmake( -DITK_USE_SYSTEM_PNG=ON -DITK_USE_SYSTEM_TIFF=ON -DITK_USE_SYSTEM_ZLIB=ON + -DITK_USE_SYSTEM_EIGEN=ON # This should be turned on some day, however for now ITK does download specific versions so it shouldn't spontaneously break -DITK_FORBID_DOWNLOADS=OFF @@ -54,8 +54,8 @@ vcpkg_configure_cmake( #-DITK_WRAP_PYTHON=ON #-DITK_PYTHON_VERSION=3 - -DITK_USE_SYSTEM_HDF5=ON - -DModule_ITKVtkGlue=${ITKVtkGlue} # this option requires VTK to be a dependency in CONTROL file. VTK depends on HDF5! + -DITK_USE_SYSTEM_HDF5=ON # HDF5 was problematic in the past + -DModule_ITKVtkGlue=${ITKVtkGlue} # optional feature -DModule_IOSTL=ON # example how to turn on a non-default module -DModule_MorphologicalContourInterpolation=ON # example how to turn on a remote module @@ -68,8 +68,11 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets() # combines release and debug build configurations +file(RENAME ${CURRENT_PACKAGES_DIR}/vcl_compiler_detection.h ${CURRENT_PACKAGES_DIR}/include/ITK-5.0/vcl_compiler_detection.h) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/vcl_compiler_detection.h) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/itk) |