From d4fbdf21c4618a07089a8e6388e01b144e5c2baa Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Wed, 7 Aug 2019 18:30:42 +0200 Subject: [PATCH] [itk] Support legacy user code by default (#7241) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No longer specify `ITK_LEGACY_REMOVE` and `ITK_FUTURE_LEGACY_REMOVE` options for `vcpkg_configure_cmake`. By default, these two flags are `OFF`, for ITK 5.0.0: https://github.com/InsightSoftwareConsortium/ITK/blob/v5.0.0/CMakeLists.txt#L261 This commit will allow legacy ITK user code to build with vcpkg, and it will ease adding vcpkg support to https://github.com/SuperElastix/elastix Dženan Zukić @dzenanz suggested this change: https://discourse.itk.org/t/how-to-avoid-rebuilding-itk-by-azure-ci-at-the-github-of-another-project-elastix/2002/7 CONTROL version bumped as requested by Phil Christensen @Rastaban --- ports/itk/CONTROL | 2 +- ports/itk/portfile.cmake | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/itk/CONTROL b/ports/itk/CONTROL index b77968554c..328137e0ea 100644 --- a/ports/itk/CONTROL +++ b/ports/itk/CONTROL @@ -1,5 +1,5 @@ Source: itk -Version: 5.0.0-2 +Version: 5.0.0-3 Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis. Homepage: https://github.com/InsightSoftwareConsortium/ITK Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp], openjpeg diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index a83527a51f..3b2094079c 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -35,8 +35,6 @@ vcpkg_configure_cmake( -DITK_INSTALL_DATA_DIR=share/itk/data -DITK_INSTALL_DOC_DIR=share/itk/doc -DITK_INSTALL_PACKAGE_DIR=share/itk - -DITK_LEGACY_REMOVE=ON - -DITK_FUTURE_LEGACY_REMOVE=ON -DITK_USE_64BITS_IDS=ON -DITK_USE_CONCEPT_CHECKING=ON #-DITK_USE_SYSTEM_LIBRARIES=ON # enables USE_SYSTEM for all third party libraries, some of which do not have vcpkg ports such as CastXML, SWIG, MINC etc