Merge pull request #8501 from JackBoosY/dev/jack/8450

[itk]Fix use 64 bit ids.
This commit is contained in:
Victor Romero 2019-10-09 12:26:05 -07:00 committed by GitHub
commit 15fc811e6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View File

@ -1,5 +1,5 @@
Source: itk 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. Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.
Homepage: https://github.com/InsightSoftwareConsortium/ITK Homepage: https://github.com/InsightSoftwareConsortium/ITK
Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp], openjpeg Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp], openjpeg

View File

@ -19,6 +19,11 @@ else()
set(ITKVtkGlue OFF) set(ITKVtkGlue OFF)
endif() 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( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA
@ -30,7 +35,7 @@ vcpkg_configure_cmake(
-DITK_INSTALL_DATA_DIR=share/itk/data -DITK_INSTALL_DATA_DIR=share/itk/data
-DITK_INSTALL_DOC_DIR=share/itk/doc -DITK_INSTALL_DOC_DIR=share/itk/doc
-DITK_INSTALL_PACKAGE_DIR=share/itk -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_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_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 -DITK_USE_SYSTEM_DOUBLECONVERSION=ON