The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 11:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[itk] Upgrade to 5.0.0 (#6767)

Browse Source
This commit is contained in:
wangli28 2019-06-15 06:04:58 +08:00 committed by Victor Romero
parent 9cc9978c5b
commit d95b402980
3 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/itk/CONTROL
View File

@ -1,5 +1,5 @@
Source: itk
Version: 4.13.0-906736bd-3
Version: 5.0.0-1
Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.
Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp], openjpeg

66
ports/itk/fix_conflict_with_openjp2_pc.patch
View File

@ -1,33 +1,33 @@
diff --git a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
index 6e3504d..1d641c2 100644
--- a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
+++ b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
@@ -375,7 +375,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 itkgdcmopenjp2)
diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
index 4ffe98e..a269690 100644
--- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
+++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/CMakeLists.txt
@@ -347,12 +347,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/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

9
ports/itk/portfile.cmake
View File

@ -10,8 +10,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO InsightSoftwareConsortium/ITK
REF 906736bd453e95ccf03b318d3d07cb7884285161
SHA512 8ac62262d46e7acbb0e5b2e964292ec17e1687bb162b8cec666e5b67acbe3449f093a0b1c03737e9951cb88248ed890805ffd57df6eae21220488620da833c57
REF 3e12e7006a5881136414be54216a35bbacb55baa
SHA512 9796429f8750faffc87e44052455740d1a560883e83c3ed9614d1c7ae9cc1ae22a360b572d9bb1c5ec62ca12ac81d3aa0b8dbaffff3e4ad4c2f85077ed04a10b
HEAD_REF master
PATCHES fix_conflict_with_openjp2_pc.patch
)
@ -67,13 +67,10 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
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)
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)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/vcl_compiler_detection.h)
# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/itk)