Merge branch '267-dcmtk-3-6-0-compatibility'

closes #267

Libs/DICOM/Core/CMakeLists.txt

@@ -7,6 +7,23 @@ 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
@@ -32,6 +49,11 @@ set(KIT_SRCS
   ctkDICOMTester.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

Libs/DICOM/Core/ctkDICOMQuery.cpp

@@ -37,7 +37,7 @@
 // DCMTK includes
 #include "dcmtk/dcmnet/dimse.h"
 #include "dcmtk/dcmnet/diutil.h"
-#include <dcmtk/dcmnet/scu.h>
+#include "ctkDcmSCU.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 <dcmtk/dcmnet/scu.h>
+#include "ctkDcmSCU.h"
 
 #include <dcmtk/dcmdata/dcfilefo.h>
 #include <dcmtk/dcmdata/dcfilefo.h>