3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 00:37:57 +08:00
Code Issues Projects Releases Wiki Activity

[dcmtk] remove ICU (#42742)

Browse Source
This commit is contained in:
Paul Xu 2024-12-18 03:53:45 +08:00 committed by GitHub
parent 13737397f7
commit ab4e7d5518
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/dcmtk/dependencies.diff
View File

@ -1,10 +1,9 @@
diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
index 510027c..9f3a5da 100644 index 510027c..eb8fe90 100644
--- a/CMake/3rdparty.cmake --- a/CMake/3rdparty.cmake
+++ b/CMake/3rdparty.cmake +++ b/CMake/3rdparty.cmake
@@ -1,3 +1,11 @@ @@ -1,3 +1,10 @@
+set(CMAKE_REQUIRE_FIND_PACKAGE_Iconv "${DCMTK_WITH_ICONV}") +set(CMAKE_REQUIRE_FIND_PACKAGE_Iconv "${DCMTK_WITH_ICONV}")
+set(CMAKE_REQUIRE_FIND_PACKAGE_ICU "${DCMTK_WITH_ICU}")
+set(CMAKE_REQUIRE_FIND_PACKAGE_LibXml2 "${DCMTK_WITH_XML}") +set(CMAKE_REQUIRE_FIND_PACKAGE_LibXml2 "${DCMTK_WITH_XML}")
+set(CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL "${DCMTK_WITH_OPENSSL}") +set(CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL "${DCMTK_WITH_OPENSSL}")
+set(CMAKE_REQUIRE_FIND_PACKAGE_PNG "${DCMTK_WITH_PNG}") +set(CMAKE_REQUIRE_FIND_PACKAGE_PNG "${DCMTK_WITH_PNG}")
@ -14,7 +13,7 @@ index 510027c..9f3a5da 100644
set(USE_FIND_PACKAGE_DOCS "Control whether libraries are searched via CMake's find_package() mechanism or a Windows specific fallback") set(USE_FIND_PACKAGE_DOCS "Control whether libraries are searched via CMake's find_package() mechanism or a Windows specific fallback")
# Advanced user (eg. vcpkg) may want to override this: # Advanced user (eg. vcpkg) may want to override this:
if(NOT DEFINED DCMTK_USE_FIND_PACKAGE_WIN_DEFAULT) if(NOT DEFINED DCMTK_USE_FIND_PACKAGE_WIN_DEFAULT)
@@ -42,7 +50,7 @@ if(DCMTK_USE_FIND_PACKAGE) @@ -42,7 +49,7 @@ if(DCMTK_USE_FIND_PACKAGE)
else() else()
message(STATUS "Info: DCMTK TIFF support will be enabled") message(STATUS "Info: DCMTK TIFF support will be enabled")
include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
@ -23,7 +22,7 @@ index 510027c..9f3a5da 100644
endif() endif()
endif() endif()
endif() endif()
@@ -58,7 +66,7 @@ if(DCMTK_USE_FIND_PACKAGE) @@ -58,7 +65,7 @@ if(DCMTK_USE_FIND_PACKAGE)
message(STATUS "Info: DCMTK PNG support will be enabled") message(STATUS "Info: DCMTK PNG support will be enabled")
set(WITH_LIBPNG 1) set(WITH_LIBPNG 1)
include_directories(${PNG_INCLUDE_DIR}) include_directories(${PNG_INCLUDE_DIR})
@ -32,7 +31,7 @@ index 510027c..9f3a5da 100644
endif() endif()
endif() endif()
@@ -103,7 +111,7 @@ if(DCMTK_USE_FIND_PACKAGE) @@ -103,7 +110,7 @@ if(DCMTK_USE_FIND_PACKAGE)
else() else()
message(STATUS "Info: DCMTK XML support will be enabled") message(STATUS "Info: DCMTK XML support will be enabled")
set(WITH_LIBXML 1) set(WITH_LIBXML 1)
@ -41,7 +40,7 @@ index 510027c..9f3a5da 100644
set(LIBXML_LIBS ${LIBXML2_LIBRARIES} ${LIBXML2_EXTRA_LIBS_STATIC}) set(LIBXML_LIBS ${LIBXML2_LIBRARIES} ${LIBXML2_EXTRA_LIBS_STATIC})
endif() endif()
endif() endif()
@@ -141,7 +149,10 @@ if(DCMTK_USE_FIND_PACKAGE) @@ -141,7 +148,10 @@ if(DCMTK_USE_FIND_PACKAGE)
# Find libiconv # Find libiconv
if(DCMTK_WITH_ICONV) if(DCMTK_WITH_ICONV)
find_package(Iconv QUIET) find_package(Iconv QUIET)

1
ports/dcmtk/portfile.cmake
View File

@ -14,7 +14,6 @@ vcpkg_from_github(
) )
file(REMOVE file(REMOVE
"${SOURCE_PATH}/CMake/FindICONV.cmake" "${SOURCE_PATH}/CMake/FindICONV.cmake"
"${SOURCE_PATH}/CMake/FindICU.cmake"
"${SOURCE_PATH}/CMake/FindJPEG.cmake" "${SOURCE_PATH}/CMake/FindJPEG.cmake"
) )

1
ports/dcmtk/vcpkg.json
View File

@ -1,6 +1,7 @@
{ {
"name": "dcmtk", "name": "dcmtk",
"version": "3.6.9", "version": "3.6.9",
"port-version": 1,
"description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.", "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.",
"homepage": "https://github.com/DCMTK/dcmtk", "homepage": "https://github.com/DCMTK/dcmtk",
"license": null, "license": null,

2
versions/baseline.json
View File

@ -2266,7 +2266,7 @@
}, },
"dcmtk": { "dcmtk": {
"baseline": "3.6.9", "baseline": "3.6.9",
"port-version": 0 "port-version": 1
}, },
"debug-assert": { "debug-assert": {
"baseline": "1.3.4", "baseline": "1.3.4",

5
versions/d-/dcmtk.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "6445ef976bd199730e54bd775a4a4d111aac84c6",
"version": "3.6.9",
"port-version": 1
},
{ {
"git-tree": "7ebfbdae104c5b87bbb6280f8304be4bf7e87ebb", "git-tree": "7ebfbdae104c5b87bbb6280f8304be4bf7e87ebb",
"version": "3.6.9", "version": "3.6.9",