Skip to content

COMP: Enable DCMTK PNG/TIFF/ZLIB via find_package with ITK libraries (supersedes #5537) #6393

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.

Sign up for GitHub

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

Draft
hjmjohnson wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −9
Draft

COMP: Enable DCMTK PNG/TIFF/ZLIB via find_package with ITK libraries (supersedes #5537) #6393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01c394a
COMP: Add generated header dir to ITKPNG_INCLUDE_DIRS
hjmjohnson Jun 4, 2026
7479587
COMP: Enable DCMTK PNG/TIFF/ZLIB via find_package with ITK libraries
hjmjohnson Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions Modules/ThirdParty/DCMTK/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ endforeach()
-DDCMTK_ENABLE_CXX11:BOOL=ON
-DDCMTK_FORCE_FPIC_ON_UNIX:BOOL=ON
-DBUILD_APPS:BOOL=OFF # Only DCMTK libraries are needed
-DDCMTK_USE_FIND_PACKAGE:BOOL=ON
-DDCMTK_WITH_OPENSSL:BOOL=OFF
-DDCMTK_WITH_PNG:BOOL=ON
-DDCMTK_WITH_XML:BOOL=OFF
Expand All @@ -340,6 +341,13 @@ endforeach()

if(MSVC)
list(APPEND DCMTK_EP_FLAGS -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS:BOOL=OFF)
# DCMTK's STL feature probes read __cplusplus, which MSVC underreports
# until /Zc:__cplusplus is set; pass it up front so the probes enable C++17.
Comment thread
hjmjohnson marked this conversation as resolved.
list(
APPEND
DCMTK_EP_FLAGS
"-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} /Zc:__cplusplus"
)
endif()

if("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
Expand Down Expand Up @@ -453,14 +461,14 @@ endforeach()
-DDCMTK_DEFAULT_DICT:STRING=builtin -DDCMTK_WITH_DOXYGEN:BOOL=OFF
-DDCMTK_WITH_SNDFILE:BOOL=OFF -DDCMTK_WITH_WRAP:BOOL=OFF
-DDCMTK_ENABLE_PRIVATE_TAGS:BOOL=ON
-DJPEG_LIBRARY:PATH=${DCMTKJPEG_LIBRARIES}
-DJPEG_INCLUDE_DIR:PATH=${DCMTKJPEG_INCLUDE_DIRS}
-DTIFF_INCLUDE_DIR:STRING=${DCMTKTIFF_INCLUDE_DIRS}
-DTIFF_LIBRARY:PATH=${DCMTKTIFF_LIBRARIES}
-DJPEG_LIBRARIES:STRING=${DCMTKJPEG_LIBRARIES}
-DJPEG_INCLUDE_DIRS:STRING=${DCMTKJPEG_INCLUDE_DIRS}
-DTIFF_LIBRARIES:STRING=${DCMTKTIFF_LIBRARIES}
-DTIFF_INCLUDE_DIRS:STRING=${DCMTKTIFF_INCLUDE_DIRS}
-DZLIB_LIBRARIES:STRING=${DCMTKZLIB_LIBRARIES}
-DZLIB_INCLUDE_DIRS:STRING=${DCMTKZLIB_INCLUDE_DIRS}
-DZLIB_LIBS:PATH=${DCMTKZLIB_LIBRARIES}
-DPNG_INCLUDE_DIR:STRING=${DCMTKPNG_INCLUDE_DIRS}
-DPNG_LIBRARY:PATH=${DCMTKPNG_LIBRARIES} ${DCMTK_EP_FLAGS}
-DPNG_LIBRARIES:STRING=${DCMTKPNG_LIBRARIES}
-DPNG_INCLUDE_DIRS:STRING=${DCMTKPNG_INCLUDE_DIRS} ${DCMTK_EP_FLAGS}
${_cross_compiling_flags}
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
${CMAKE_CXX_COMPILER_LAUNCHER_FLAG}
Expand Down
6 changes: 4 additions & 2 deletions Modules/ThirdParty/DCMTK/DCMTKGitTag.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ set(
#Francois Budin (1):
#COMP: Uses ITK PNG instead of system PNG

#Hans Johnson (1):
#Hans Johnson (3):
#COMP: Mods to allow using ITK libs
#COMP: Use ITK-provided JPEG/TIFF hints instead of find_package
#COMP: Consume standard *_LIBRARIES variables for TIFF/JPEG/PNG/ZLIB

#Jean-Christophe Fillion-Robin (1):
#COMP: Set 3rd party package CMake variables only if needed
Expand All @@ -36,4 +38,4 @@ set(
#COMP: fix WASI compiler errors
#COMP: fix missing <csetjmp> header issue

set(DCMTK_GIT_TAG "2f645cb91b603ccc674857ea05b9822a8a899675") # for/itk-dcmtk-3.7.0-ccfd10b
set(DCMTK_GIT_TAG "7c7dc11d8e638711ac9c475210d7c7b352832cee") # for/itk-dcmtk-3.7.0-ccfd10b
1 change: 1 addition & 0 deletions Modules/ThirdParty/PNG/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ else()
set(
ITKPNG_INCLUDE_DIRS
${ITKPNG_BINARY_DIR}/src
${ITKPNG_BINARY_DIR}/src/itkpng
${ITKPNG_SOURCE_DIR}/src
)
set(ITKPNG_LIBRARIES itkpng)
Expand Down
Loading