# HG changeset patch # User Sebastien Jodogne # Date 1479117493 -3600 # Node ID e438b5964d77e3375d1b50bdf070e81947bb39ac # Parent e18023c2fdfbaa9eb76b55669a16469073d0415b fix dcmtk 3.6.1 build diff -r e18023c2fdfb -r e438b5964d77 Resources/CMake/DcmtkConfiguration.cmake --- a/Resources/CMake/DcmtkConfiguration.cmake Thu Nov 10 08:47:31 2016 +0100 +++ b/Resources/CMake/DcmtkConfiguration.cmake Mon Nov 14 10:58:13 2016 +0100 @@ -65,6 +65,11 @@ 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) @@ -181,7 +186,6 @@ list(REMOVE_ITEM DCMTK_SOURCES ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdictbi.cc ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/mkdeftag.cc - ${DCMTK_SOURCES_DIR}/dcmdata/libsrc/dcdictbi.cc ) #set_source_files_properties(${DCMTK_SOURCES}