aboutsummaryrefslogtreecommitdiff
path: root/ports/itk
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-06-21 04:11:54 +0200
committerCurtis J Bezault <curtbezault@gmail.com>2019-06-20 19:11:54 -0700
commit47d206e149e88201333b5ca8fe55c30e2b1a8177 (patch)
treec0620a39116333a6cb6ffc092983ba7114c6daf2 /ports/itk
parente16efa4d6aa6f36247eb6dfd646fdf81af0c36e0 (diff)
downloadvcpkg-47d206e149e88201333b5ca8fe55c30e2b1a8177.tar.gz
vcpkg-47d206e149e88201333b5ca8fe55c30e2b1a8177.zip
[many ports] improvements for linux/wsl (#6730)
* [many ports] improve compatibility with WSL and mixed case filesystems * [treehopper] express dependency on libusb, which was not working on non-win32 platforms and is still broken there * [libharu] add compatibility with non-win32 platforms * [geogram] fix openblas on linux [clapack] better integration with linux environment [visit-struct] put cmake config file in the expected folder [geogram] remove trailing underscore to enable compatibility with OpenBLAS * [openblas] playing with underscore, without success * [openblas/lapack] fix library integration * [clapack] improve target handling in cmake module * [openblas] promote self-generated config to default cmake module, otherwise internal ones thinks wrongly that openblas can also solve lapack libs * [clapack,openblas] improve libraries integration * [many ports] fix cmake unnecessary target paths, wrong config paths, empty default dependencies, unnecessary [core] tags * [suitesparse] improve integration with new lapack/openblas mechanism * [suitesparse] add no underscore postfix also for linux * [ceres] fix integration with newer openblas/lapack configs * [aws-c-event-stream] fix regression * [systemc] fix regression * [libwebp,geogram] trigger rebuild * [libwebp,pthread4w] fix regressions * [glbinding] fix cmake module installation * [globjects] disentangle unnecessary dependency from qt5 * [jasper] remove broken and unnecessary patches * [libwebp] fix regression * [many ports] avoid using BUILD_SHARED_LIBS which is uninitialized in port files * [clapack] correctly find dlls * [clapack] use a generic blas as dependency * [fizz,g2o] restore expected version * fix mistake * [many ports] remove WIN32, APPLE and UNIX (again, they keep creeping in) from ports since they are broken and usually break non-win32 ports * [libressl,openssl] do not try to build one if the other is already installed * [itk] update ref and patch to avoid regression * [libressl,openssl] implement full strategy to fix CI * [libwebp] disable components that are broken on macOS * [ogre] enable macOS build * [freeimage,jxrlib,ogre,openexr,protobuf] port patches from #5169 * [ogre] add missing install command * [ffmpeg] enable wrapper for cmake module * [ffmpeg] add avresample module finder * [ffmpeg] improve module detection and exported symbols * [ffmpeg] add variables to cache * [thrift] remove unnecessary build option * [allegro5] fix shared/static inversion * [protobuf] cleanup * [libressl] cleanup * [moos-core] cleanup * commented features must not be separated from other features, otherwise vcpkg complains * [itk] fix regression * [shogun,itk] fix regressions * [ogre] fix regression * [opusfile] add compatibility with non-win32 * [itk] fix regression * [sndfile,libsndfile] remove duplicate, redirect sndfile to libsndfile * add missing dependencies * [ismrmrd] fix regression * [ffmpeg] trigger rebuild * [clapack,openblas,libogg] fix regressions on macOS * [libtins] fix regression * force rebuild windows regressions, unable to reproduce locally * [mosquitto] enable non-win32 builds * [json-dto] force rebuild, unable to reproduce regression locally * [many ports] uniform naming and path length requests * fix regression * fix regression * [ffmpeg] fixes for downstream projects * clean up - thanks to reviewers * trigger rebuild of regressions on macOS * trigger rebuild of regressions on macOS - part2 * Add core back * Use VCPKG_CONCURRENCY * Add core back to suitesparse * Add core back to curl * Add core back to magnum * Add core back to magnum * Add core back to magnum * Add core back to cgal
Diffstat (limited to 'ports/itk')
-rw-r--r--ports/itk/CONTROL2
-rw-r--r--ports/itk/fix_conflict_with_openjp2_pc.patch33
-rw-r--r--ports/itk/fix_libminc_config_path.patch13
-rw-r--r--ports/itk/fix_openjpeg_search.patch13
-rw-r--r--ports/itk/portfile.cmake18
5 files changed, 36 insertions, 43 deletions
diff --git a/ports/itk/CONTROL b/ports/itk/CONTROL
index b8ba70d0f..b77968554 100644
--- a/ports/itk/CONTROL
+++ b/ports/itk/CONTROL
@@ -1,5 +1,5 @@
Source: itk
-Version: 5.0.0-1
+Version: 5.0.0-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/fix_conflict_with_openjp2_pc.patch b/ports/itk/fix_conflict_with_openjp2_pc.patch
deleted file mode 100644
index b1a2fb6ec..000000000
--- a/ports/itk/fix_conflict_with_openjp2_pc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
-index 6ac16ab6..2bde9952 100644
---- a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
-+++ b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
-@@ -373,7 +373,8 @@ else()
- endif()
-
- if(GDCM_USE_SYSTEM_OPENJPEG)
-- find_package(OpenJPEG 2.0.0 REQUIRED)
-+ # openjpeg version in vcpkg is already greater than 2.0.0 and openjpeg has no version.cmake file
-+ find_package(OpenJPEG REQUIRED)
- set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
- else()
- set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2)
-diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
-index 565cc338..ec126ef9 100644
---- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
-+++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
-@@ -359,12 +359,8 @@ endif()
-
- #-----------------------------------------------------------------------------
- # pkgconfig support
--# enabled by default on Unix, disabled by default on other platforms
--if(UNIX)
-- option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" ON)
--else()
-- option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF)
--endif()
-+# Cannot use the built-in openjp2 because the configuration path is under buildtrees
-+option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF)
- if(BUILD_PKGCONFIG_FILES)
- # install in lib and not share (see multi-arch note above)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
diff --git a/ports/itk/fix_libminc_config_path.patch b/ports/itk/fix_libminc_config_path.patch
new file mode 100644
index 000000000..3ff305d4b
--- /dev/null
+++ b/ports/itk/fix_libminc_config_path.patch
@@ -0,0 +1,13 @@
+diff --git a/Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt b/Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt
+index 305b2c63..63f81a53 100644
+--- a/Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt
++++ b/Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt
+@@ -550,7 +550,7 @@ IF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT)
+ ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINCConfig.cmake
+ DESTINATION
+- ${LIBMINC_INSTALL_LIB_DIR}/cmake
++ share/itk
+ COMPONENT Development)
+ ENDIF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT)
+
diff --git a/ports/itk/fix_openjpeg_search.patch b/ports/itk/fix_openjpeg_search.patch
new file mode 100644
index 000000000..d17a1ab84
--- /dev/null
+++ b/ports/itk/fix_openjpeg_search.patch
@@ -0,0 +1,13 @@
+diff --git a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
+index 6ac16ab6..4638f13c 100644
+--- a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
++++ b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
+@@ -373,7 +373,7 @@ else()
+ endif()
+
+ if(GDCM_USE_SYSTEM_OPENJPEG)
+- find_package(OpenJPEG 2.0.0 REQUIRED)
++ find_package(OpenJPEG REQUIRED)
+ set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
+ else()
+ set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2)
diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake
index 77dd88d9d..a83527a51 100644
--- a/ports/itk/portfile.cmake
+++ b/ports/itk/portfile.cmake
@@ -1,8 +1,8 @@
include(vcpkg_common_functions)
string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
-if(BUILDTREES_PATH_LENGTH GREATER 50 AND CMAKE_HOST_WIN32)
- message(WARNING "ITKs buildsystem uses very long paths and may fail on your system.\n"
+if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
+ message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n"
"We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
)
endif()
@@ -10,10 +10,12 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO InsightSoftwareConsortium/ITK
- REF 3e12e7006a5881136414be54216a35bbacb55baa
- SHA512 9796429f8750faffc87e44052455740d1a560883e83c3ed9614d1c7ae9cc1ae22a360b572d9bb1c5ec62ca12ac81d3aa0b8dbaffff3e4ad4c2f85077ed04a10b
+ REF v5.0.0
+ SHA512 7eecd62ab3124147f0abce482699dfdc43610703959d4a3f667c8ce12a6ecacf836a863d146f3cc7d5220b4aa05adf70a0d4dc6fa8e87bac215565badc96acff
HEAD_REF master
- PATCHES fix_conflict_with_openjp2_pc.patch
+ PATCHES
+ fix_openjpeg_search.patch
+ fix_libminc_config_path.patch
)
if ("vtk" IN_LIST FEATURES)
@@ -66,12 +68,10 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) # combines release and debug build configurations
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-# Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/itk)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/itk/LICENSE ${CURRENT_PACKAGES_DIR}/share/itk/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)