Remove DCMTK 3.6.0 compatibility cruft

CMake/CTestCustom.cmake.in

@@ -75,9 +75,6 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION
   "PythonQt.*src.*PythonQt.*(cpp|h)"
   "include.PythonQt.PythonQt.*h"
 
-  # ctkDcmSCU is a copy from dcmtk, it should be fixed there.
-  ".*ctkDcmSCU.cc.*"
-
   # Suppressing warnings about duplicate libraries in Darwin
   # At some point this may be addressed by CMake feature request: 
   # http://public.kitware.com/Bug/view.php?id=10179

Libs/DICOM/Core/CMakeLists.txt

@@ -6,22 +6,6 @@ project(CTKDICOMCore)
 
 set(KIT_export_directive "CTK_DICOM_CORE_EXPORT")
 
-# determine the DCMTK version we're using
-if(EXISTS ${DCMTK_config_INCLUDE_DIR}/cfunix.h)
-  set(_DCMTK_CONFIG_HEADER ${DCMTK_config_INCLUDE_DIR}/cfunix.h)
-elseif(EXISTS ${DCMTK_config_INCLUDE_DIR}/osconfig.h)
-  set(_DCMTK_CONFIG_HEADER ${DCMTK_config_INCLUDE_DIR}/osconfig.h)
-else()
-  message(SEND_ERROR "DCMTK version cannot be determined!")
-endif()
-
-file(READ ${_DCMTK_CONFIG_HEADER} _DCMTK_CONFIG)
-# simple check, we do not expect anything else
-if(_DCMTK_CONFIG MATCHES "PACKAGE_VERSION_NUMBER 360")
-  set(DCMTK_VERSION_IS_360 1)
-  message(STATUS "Detected DCMTK 3.6.0, will include backported SCU")
-endif()
-
 # Source files
 set(KIT_SRCS
   ctkDICOMAbstractThumbnailGenerator.cpp
@@ -52,51 +36,12 @@ set(KIT_SRCS
   ctkDICOMUtil.h
 )
 
-if(DCMTK_VERSION_IS_360)
-  list(APPEND KIT_SRCS ctkDcmSCU.cc)
-endif(DCMTK_VERSION_IS_360)
-
-
 # Abstract class should not be wrapped !
 set_source_files_properties(
   ctkDICOMAbstractThumbnailGenerator.h
   WRAP_EXCLUDE
   )
 
-# XXX DCMTK 3.6.1: Remove the HAVE_DCMTK_LOG4CPLUS_LOGGER test when DCMTK 3.6.1
-#     can be expected on all supported platforms.
-# XXX On multi configuration system, there is no way to run 'try_compile` configure
-#     tests based on the configuration that WILL be selected to build the project.
-#     Since the try compile test 'HAVE_DCMTK_LOG4CPLUS_LOGGER' has originally been
-#     added to be able to build against DCMTK 3.6.0 available by default on linux
-#     distribution. Let's skip it in the case of multi configuration system and
-#     assume DCMTK provides 'dcmtk::log4cplus::Logger'.
-#     We also skip this test if DCMTK_CMAKE_DEBUG_POSTFIX is set, because then the
-#     DCMTK_LIBRARIES variable will have a value similar to "debug <lib1> ..." which
-#     will not link the DCMTK debug libraries in the try_compile call because
-#     BUILD_TYPE cannot be set for the generated CMakeLists.txt file.
-# TODO When build as external project, the config of the parent project could be passed to CTK
-#      and used as a hint. We need to define what would be the convention for such hint.
-if(DCMTK_CMAKE_DEBUG_POSTFIX OR (CMAKE_CONFIGURATION_TYPES AND NOT DEFINED HAVE_DCMTK_LOG4CPLUS_LOGGER))
-  set(HAVE_DCMTK_LOG4CPLUS_LOGGER 1 CACHE INTERNAL "Test HAVE_DCMTK_LOG4CPLUS_LOGGER")
-endif()
-# Check if DCMTK provides 'dcmtk::log4cplus::Logger', if not fallback to 'log4cplus::Logger'.
-# Indeed, following DCMTK-3.6.1_20110519 (commit e39d190), log4cplus has been moved
-# into dcmtk::log4cplus namespace.
-include(CheckCXXSourceCompiles)
-set(CMAKE_REQUIRED_DEFINITIONS -DHAVE_CONFIG_H)
-set(CMAKE_REQUIRED_INCLUDES ${DCMTK_INCLUDE_DIRS})
-set(CMAKE_REQUIRED_LIBRARIES ${DCMTK_LIBRARIES})
-check_cxx_source_compiles(
-  "#include <dcmtk/oflog/oflog.h>\nint main(int, char*[]){dcmtk::log4cplus::Logger logger; return 0;}"
-  HAVE_DCMTK_LOG4CPLUS_LOGGER)
-if(HAVE_DCMTK_LOG4CPLUS_LOGGER)
-  set_source_files_properties(
-    ctkDICOMUtil.cpp
-    PROPERTIES COMPILE_DEFINITIONS HAVE_DCMTK_LOG4CPLUS_LOGGER
-    )
-endif()
-
 # Headers that should run through moc
 set(KIT_MOC_SRCS
   ctkDICOMAbstractThumbnailGenerator.h

Libs/DICOM/Core/ctkDICOMQuery.cpp

@@ -38,7 +38,7 @@
 // DCMTK includes
 #include "dcmtk/dcmnet/dimse.h"
 #include "dcmtk/dcmnet/diutil.h"
-#include "ctkDcmSCU.h"
+#include "dcmtk/dcmnet/scu.h"
 
 #include <dcmtk/dcmdata/dcfilefo.h>
 #include <dcmtk/dcmdata/dcfilefo.h>

Libs/DICOM/Core/ctkDICOMRetrieve.cpp

@@ -29,7 +29,7 @@
 // DCMTK includes
 #include "dcmtk/dcmnet/dimse.h"
 #include "dcmtk/dcmnet/diutil.h"
-#include "ctkDcmSCU.h"
+#include "dcmtk/dcmnet/scu.h"
 
 #include <dcmtk/dcmdata/dcfilefo.h>
 #include <dcmtk/dcmdata/dcfilefo.h>

Libs/DICOM/Core/ctkDICOMUtil.cpp

@@ -30,11 +30,7 @@
 //------------------------------------------------------------------------------
 void ctk::setDICOMLogLevel(ctkErrorLogLevel::LogLevel level)
 {
-#ifdef HAVE_DCMTK_LOG4CPLUS_LOGGER
   dcmtk::log4cplus::Logger log = dcmtk::log4cplus::Logger::getRoot();
-#else
-  log4cplus::Logger log = log4cplus::Logger::getRoot();
-#endif
   switch (level)
     {
     case ctkErrorLogLevel::Trace: log.setLogLevel(OFLogger::TRACE_LOG_LEVEL); break;
@@ -53,11 +49,7 @@ void ctk::setDICOMLogLevel(ctkErrorLogLevel::LogLevel level)
 //------------------------------------------------------------------------------
 ctkErrorLogLevel::LogLevel ctk::dicomLogLevel()
 {
-#ifdef HAVE_DCMTK_LOG4CPLUS_LOGGER
   dcmtk::log4cplus::Logger log = dcmtk::log4cplus::Logger::getRoot();
-#else
-  log4cplus::Logger log = log4cplus::Logger::getRoot();
-#endif
   switch (log.getLogLevel())
     {
     case OFLogger::TRACE_LOG_LEVEL: return ctkErrorLogLevel::Trace;