Skip to content

WIP: REMOTE_MODULE_TEST BUG: Fix DCMTK external module compatibility (ijg include paths + MSVC __cplusplus) #6072

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

Closed
hjmjohnson wants to merge 2 commits into from
+15 −0
Closed

WIP: REMOTE_MODULE_TEST BUG: Fix DCMTK external module compatibility (ijg include paths + MSVC __cplusplus) #6072

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
8eb864b
BUG: Exclude DCMTK ijg* libs from INTERFACE_INCLUDE_DIRECTORIES
hjmjohnson Apr 15, 2026
83b7500
COMP: Add /Zc:__cplusplus for MSVC to fix DCMTK C++11 detection
hjmjohnson Apr 15, 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
9 changes: 9 additions & 0 deletions CMake/itkCompilerChecks.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,12 @@ if(NOT ITK_IGNORE_CMAKE_CXX17_CHECKS)
set(CMAKE_CXX_EXTENSIONS OFF)
endif()
endif()

# MSVC does not set __cplusplus correctly by default (returns 199711L
# regardless of the actual standard). /Zc:__cplusplus makes it report
# the true value. Required for third-party headers (e.g. DCMTK
# osconfig.h) that check __cplusplus >= 201103L at compile time.
# Available since VS2017 15.7 (MSVC 19.14); we require 19.20+.
if(MSVC AND NOT CMAKE_CXX_FLAGS MATCHES "/Zc:__cplusplus")
string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
endif()
6 changes: 6 additions & 0 deletions Modules/ThirdParty/DCMTK/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,13 @@ else(ITK_USE_SYSTEM_DCMTK)
set(ITKDCMTK_LIBRARIES "${_ITKDCMTK_LIB_NAMES}")
#
# add all the embedded include directories to include dirs
# Skip internal JPEG codec libraries (ijg8, ijg12, ijg16) — they have
# no public headers and exporting non-existent paths in
# INTERFACE_INCLUDE_DIRECTORIES causes CMake errors in external modules.
foreach(lib ${_ITKDCMTK_LIB_NAMES})
if(lib MATCHES "^ijg")
continue()
endif()
# add to include list
list(APPEND ITKDCMTK_INCLUDE_DIRS
${ITKDCMTK_INCLUDE}/${lib}/include)
Expand Down
Loading