Add DCMTK 3.6.0 support to ctkDICOMUtil.cpp

This commit implements a try_compile checking 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.

See commontk#405

Author: jcfr

Libs/DICOM/Core/CMakeLists.txt

@@ -6,7 +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)
@@ -16,7 +15,6 @@ 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")
@@ -65,6 +63,23 @@ set_source_files_properties(
   WRAP_EXCLUDE
   )
 
+# 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/ctkDICOMUtil.cpp

@@ -25,12 +25,16 @@
 #include "ctkDICOMUtil.h"
 
 // DCMTK includes
-#include <dcmtk/dcmnet/diutil.h>
+#include <dcmtk/oflog/oflog.h>
 
 //------------------------------------------------------------------------------
 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;
@@ -49,7 +53,11 @@ 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;