Skip to content

Commit ab4e7d5

Browse files
authored
[dcmtk] remove ICU (microsoft#42742)
1 parent 1373739 commit ab4e7d5

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

ports/dcmtk/dependencies.diff

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
2-
index 510027c..9f3a5da 100644
2+
index 510027c..eb8fe90 100644
33
--- a/CMake/3rdparty.cmake
44
+++ b/CMake/3rdparty.cmake
5-
@@ -1,3 +1,11 @@
5+
@@ -1,3 +1,10 @@
66
+set(CMAKE_REQUIRE_FIND_PACKAGE_Iconv "${DCMTK_WITH_ICONV}")
7-
+set(CMAKE_REQUIRE_FIND_PACKAGE_ICU "${DCMTK_WITH_ICU}")
87
+set(CMAKE_REQUIRE_FIND_PACKAGE_LibXml2 "${DCMTK_WITH_XML}")
98
+set(CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL "${DCMTK_WITH_OPENSSL}")
109
+set(CMAKE_REQUIRE_FIND_PACKAGE_PNG "${DCMTK_WITH_PNG}")
@@ -14,7 +13,7 @@ index 510027c..9f3a5da 100644
1413
set(USE_FIND_PACKAGE_DOCS "Control whether libraries are searched via CMake's find_package() mechanism or a Windows specific fallback")
1514
# Advanced user (eg. vcpkg) may want to override this:
1615
if(NOT DEFINED DCMTK_USE_FIND_PACKAGE_WIN_DEFAULT)
17-
@@ -42,7 +50,7 @@ if(DCMTK_USE_FIND_PACKAGE)
16+
@@ -42,7 +49,7 @@ if(DCMTK_USE_FIND_PACKAGE)
1817
else()
1918
message(STATUS "Info: DCMTK TIFF support will be enabled")
2019
include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
@@ -23,7 +22,7 @@ index 510027c..9f3a5da 100644
2322
endif()
2423
endif()
2524
endif()
26-
@@ -58,7 +66,7 @@ if(DCMTK_USE_FIND_PACKAGE)
25+
@@ -58,7 +65,7 @@ if(DCMTK_USE_FIND_PACKAGE)
2726
message(STATUS "Info: DCMTK PNG support will be enabled")
2827
set(WITH_LIBPNG 1)
2928
include_directories(${PNG_INCLUDE_DIR})
@@ -32,7 +31,7 @@ index 510027c..9f3a5da 100644
3231
endif()
3332
endif()
3433

35-
@@ -103,7 +111,7 @@ if(DCMTK_USE_FIND_PACKAGE)
34+
@@ -103,7 +110,7 @@ if(DCMTK_USE_FIND_PACKAGE)
3635
else()
3736
message(STATUS "Info: DCMTK XML support will be enabled")
3837
set(WITH_LIBXML 1)
@@ -41,7 +40,7 @@ index 510027c..9f3a5da 100644
4140
set(LIBXML_LIBS ${LIBXML2_LIBRARIES} ${LIBXML2_EXTRA_LIBS_STATIC})
4241
endif()
4342
endif()
44-
@@ -141,7 +149,10 @@ if(DCMTK_USE_FIND_PACKAGE)
43+
@@ -141,7 +148,10 @@ if(DCMTK_USE_FIND_PACKAGE)
4544
# Find libiconv
4645
if(DCMTK_WITH_ICONV)
4746
find_package(Iconv QUIET)

ports/dcmtk/portfile.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ vcpkg_from_github(
1414
)
1515
file(REMOVE
1616
"${SOURCE_PATH}/CMake/FindICONV.cmake"
17-
"${SOURCE_PATH}/CMake/FindICU.cmake"
1817
"${SOURCE_PATH}/CMake/FindJPEG.cmake"
1918
)
2019

ports/dcmtk/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "dcmtk",
33
"version": "3.6.9",
4+
"port-version": 1,
45
"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.",
56
"homepage": "https://github.com/DCMTK/dcmtk",
67
"license": null,

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2266,7 +2266,7 @@
22662266
},
22672267
"dcmtk": {
22682268
"baseline": "3.6.9",
2269-
"port-version": 0
2269+
"port-version": 1
22702270
},
22712271
"debug-assert": {
22722272
"baseline": "1.3.4",

versions/d-/dcmtk.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "6445ef976bd199730e54bd775a4a4d111aac84c6",
5+
"version": "3.6.9",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "7ebfbdae104c5b87bbb6280f8304be4bf7e87ebb",
510
"version": "3.6.9",

0 commit comments

Comments
 (0)