-
Notifications
You must be signed in to change notification settings - Fork 6.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[dcmtk] remove ICU #42742
Merged
Merged
[dcmtk] remove ICU #42742
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
ec5e58b
remove ICU
xb284524239 f8e1dad
remove ICU
xb284524239 376e062
Merge branch 'microsoft:master' into master
xb284524239 79d3ab4
fix EOL
xb284524239 2452cef
fix EOL
xb284524239 64ca894
Delete ports/dcmtk/dependencies.diff
xb284524239 a037848
fix EOL
xb284524239 3237666
update version
xb284524239 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,54 @@ | ||
| diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake | ||
| index 510027c..9f3a5da 100644 | ||
| --- a/CMake/3rdparty.cmake | ||
| +++ b/CMake/3rdparty.cmake | ||
| @@ -1,3 +1,11 @@ | ||
| +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_OpenSSL "${DCMTK_WITH_OPENSSL}") | ||
| +set(CMAKE_REQUIRE_FIND_PACKAGE_PNG "${DCMTK_WITH_PNG}") | ||
| +set(CMAKE_REQUIRE_FIND_PACKAGE_TIFF "${DCMTK_WITH_TIFF}") | ||
| +set(CMAKE_REQUIRE_FIND_PACKAGE_ZLIB "${DCMTK_WITH_ZLIB}") | ||
| + | ||
| 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: | ||
| if(NOT DEFINED DCMTK_USE_FIND_PACKAGE_WIN_DEFAULT) | ||
| @@ -42,7 +50,7 @@ if(DCMTK_USE_FIND_PACKAGE) | ||
| else() | ||
| message(STATUS "Info: DCMTK TIFF support will be enabled") | ||
| include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) | ||
| - set(LIBTIFF_LIBS ${TIFF_LIBRARIES} ${TIFF_EXTRA_LIBS_STATIC} ${JPEG_LIBRARIES}) | ||
| + set(LIBTIFF_LIBS ${TIFF_LIBRARIES}) | ||
| endif() | ||
| endif() | ||
| endif() | ||
| @@ -58,7 +66,7 @@ if(DCMTK_USE_FIND_PACKAGE) | ||
| message(STATUS "Info: DCMTK PNG support will be enabled") | ||
| set(WITH_LIBPNG 1) | ||
| include_directories(${PNG_INCLUDE_DIR}) | ||
| - set(LIBPNG_LIBS ${PNG_LIBRARY}) | ||
| + set(LIBPNG_LIBS ${PNG_LIBRARIES}) | ||
| endif() | ||
| endif() | ||
|
|
||
| @@ -103,7 +111,7 @@ if(DCMTK_USE_FIND_PACKAGE) | ||
| else() | ||
| message(STATUS "Info: DCMTK XML support will be enabled") | ||
| set(WITH_LIBXML 1) | ||
| - include_directories(${LIBXML2_INCLUDE_DIR}) | ||
| + include_directories(${LIBXML2_INCLUDE_DIRS}) | ||
| set(LIBXML_LIBS ${LIBXML2_LIBRARIES} ${LIBXML2_EXTRA_LIBS_STATIC}) | ||
| endif() | ||
| endif() | ||
| @@ -141,7 +149,10 @@ if(DCMTK_USE_FIND_PACKAGE) | ||
| # Find libiconv | ||
| if(DCMTK_WITH_ICONV) | ||
| find_package(Iconv QUIET) | ||
| - find_package(LIBCHARSET QUIET) | ||
| + set(ICONV_FOUND 1) | ||
| + if(CHARSET_LIBRARIES) | ||
| + set(LIBCHARSET_FOUND 1) | ||
| + endif() | ||
| if(ICONV_FOUND) | ||
| if(NOT Iconv_IS_BUILT_IN) | ||
| set(LIBICONV_FOUND ${ICONV_FOUND}) | ||
| diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake | ||
| index 510027c..eb8fe90 100644 | ||
| --- a/CMake/3rdparty.cmake | ||
| +++ b/CMake/3rdparty.cmake | ||
| @@ -1,3 +1,10 @@ | ||
| +set(CMAKE_REQUIRE_FIND_PACKAGE_Iconv "${DCMTK_WITH_ICONV}") | ||
| +set(CMAKE_REQUIRE_FIND_PACKAGE_LibXml2 "${DCMTK_WITH_XML}") | ||
| +set(CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL "${DCMTK_WITH_OPENSSL}") | ||
| +set(CMAKE_REQUIRE_FIND_PACKAGE_PNG "${DCMTK_WITH_PNG}") | ||
| +set(CMAKE_REQUIRE_FIND_PACKAGE_TIFF "${DCMTK_WITH_TIFF}") | ||
| +set(CMAKE_REQUIRE_FIND_PACKAGE_ZLIB "${DCMTK_WITH_ZLIB}") | ||
| + | ||
| 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: | ||
| if(NOT DEFINED DCMTK_USE_FIND_PACKAGE_WIN_DEFAULT) | ||
| @@ -42,7 +49,7 @@ if(DCMTK_USE_FIND_PACKAGE) | ||
| else() | ||
| message(STATUS "Info: DCMTK TIFF support will be enabled") | ||
| include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) | ||
| - set(LIBTIFF_LIBS ${TIFF_LIBRARIES} ${TIFF_EXTRA_LIBS_STATIC} ${JPEG_LIBRARIES}) | ||
| + set(LIBTIFF_LIBS ${TIFF_LIBRARIES}) | ||
| endif() | ||
| endif() | ||
| endif() | ||
| @@ -58,7 +65,7 @@ if(DCMTK_USE_FIND_PACKAGE) | ||
| message(STATUS "Info: DCMTK PNG support will be enabled") | ||
| set(WITH_LIBPNG 1) | ||
| include_directories(${PNG_INCLUDE_DIR}) | ||
| - set(LIBPNG_LIBS ${PNG_LIBRARY}) | ||
| + set(LIBPNG_LIBS ${PNG_LIBRARIES}) | ||
| endif() | ||
| endif() | ||
|
|
||
| @@ -103,7 +110,7 @@ if(DCMTK_USE_FIND_PACKAGE) | ||
| else() | ||
| message(STATUS "Info: DCMTK XML support will be enabled") | ||
| set(WITH_LIBXML 1) | ||
| - include_directories(${LIBXML2_INCLUDE_DIR}) | ||
| + include_directories(${LIBXML2_INCLUDE_DIRS}) | ||
| set(LIBXML_LIBS ${LIBXML2_LIBRARIES} ${LIBXML2_EXTRA_LIBS_STATIC}) | ||
| endif() | ||
| endif() | ||
| @@ -141,7 +148,10 @@ if(DCMTK_USE_FIND_PACKAGE) | ||
| # Find libiconv | ||
| if(DCMTK_WITH_ICONV) | ||
| find_package(Iconv QUIET) | ||
| - find_package(LIBCHARSET QUIET) | ||
| + set(ICONV_FOUND 1) | ||
| + if(CHARSET_LIBRARIES) | ||
| + set(LIBCHARSET_FOUND 1) | ||
| + endif() | ||
| if(ICONV_FOUND) | ||
| if(NOT Iconv_IS_BUILT_IN) | ||
| set(LIBICONV_FOUND ${ICONV_FOUND}) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like the EOL has changed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have fixed it.