diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-10-09 12:26:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 12:26:05 -0700 |
| commit | 15fc811e6d8a2b69c495e967a994ae60ecd959da (patch) | |
| tree | dbcf764b931d6bd3688ae504d906cbb9a3685f7f | |
| parent | aa08e7098f2aae6af24ca937b40d5ac6b8ea35b3 (diff) | |
| parent | 3de3c82039edd32e02973d215c2238bfb1d2fb06 (diff) | |
| download | vcpkg-15fc811e6d8a2b69c495e967a994ae60ecd959da.tar.gz vcpkg-15fc811e6d8a2b69c495e967a994ae60ecd959da.zip | |
Merge pull request #8501 from JackBoosY/dev/jack/8450
[itk]Fix use 64 bit ids.
| -rw-r--r-- | ports/itk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/itk/portfile.cmake | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ports/itk/CONTROL b/ports/itk/CONTROL index 78be9e713..282ac4b3c 100644 --- a/ports/itk/CONTROL +++ b/ports/itk/CONTROL @@ -1,5 +1,5 @@ Source: itk -Version: 5.0.1-1 +Version: 5.0.1-2 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 90cb96127..a666b5713 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -19,6 +19,11 @@ else() set(ITKVtkGlue OFF) endif() +set(USE_64BITS_IDS OFF) +if (VCPKG_TARGET_ARCHITECTURE STREQUAL x64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) + set(USE_64BITS_IDS ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -30,7 +35,7 @@ vcpkg_configure_cmake( -DITK_INSTALL_DATA_DIR=share/itk/data -DITK_INSTALL_DOC_DIR=share/itk/doc -DITK_INSTALL_PACKAGE_DIR=share/itk - -DITK_USE_64BITS_IDS=ON + -DITK_USE_64BITS_IDS=${USE_64BITS_IDS} -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 -DITK_USE_SYSTEM_DOUBLECONVERSION=ON |