# HG changeset patch # User Sebastien Jodogne # Date 1479121807 -3600 # Node ID 9a272d552c271eb17a5cbdeb22a8345a4d93c248 # Parent e438b5964d77e3375d1b50bdf070e81947bb39ac fix diff -r e438b5964d77 -r 9a272d552c27 Resources/CMake/DcmtkConfiguration.cmake --- a/Resources/CMake/DcmtkConfiguration.cmake Mon Nov 14 10:58:13 2016 +0100 +++ b/Resources/CMake/DcmtkConfiguration.cmake Mon Nov 14 12:10:07 2016 +0100 @@ -65,11 +65,6 @@ if (USE_DCMTK_361) # This step must be after the generation of "osconfig.h" INSPECT_FUNDAMENTAL_ARITHMETIC_TYPES() - else() - # Removing this file is required with DCMTK 3.6.0 - list(REMOVE_ITEM DCMTK_SOURCES - ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc - ) endif() AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmdata/libsrc DCMTK_SOURCES) @@ -188,6 +183,13 @@ ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc ) + if (NOT USE_DCMTK_361) + # Removing this file is required with DCMTK 3.6.0 + list(REMOVE_ITEM DCMTK_SOURCES + ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc + ) + endif() + #set_source_files_properties(${DCMTK_SOURCES} # PROPERTIES COMPILE_DEFINITIONS # "PACKAGE_VERSION=\"${DCMTK_PACKAGE_VERSION}\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"")