# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1349275622 -7200
# Node ID f2ecbe7d50b8312f215c8ced68cb9e846d18b84c
# Parent  7593b57dc1bf922335f0109a0c5ac66f7c0f44b7
detection of dcmtk version

diff -r 7593b57dc1bf -r f2ecbe7d50b8 OrthancServer/Internals/StoreScp.cpp
--- a/OrthancServer/Internals/StoreScp.cpp	Wed Oct 03 16:28:13 2012 +0200
+++ b/OrthancServer/Internals/StoreScp.cpp	Wed Oct 03 16:47:02 2012 +0200
@@ -64,7 +64,7 @@
 
       dataSet->transferInit();
 
-#if 1
+#if DCMTK_VERSION_NUMBER >= 360
       OFCondition c = dataSet->write(ob, xfer, encodingType, NULL,
                                      /*opt_groupLength*/ EGL_recalcGL,
                                      /*opt_paddingType*/ EPD_withoutPadding);
diff -r 7593b57dc1bf -r f2ecbe7d50b8 Resources/CMake/DcmtkConfiguration.cmake
--- a/Resources/CMake/DcmtkConfiguration.cmake	Wed Oct 03 16:28:13 2012 +0200
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Wed Oct 03 16:47:02 2012 +0200
@@ -2,6 +2,7 @@
 # differences wrt. DCMTK 3.5.x.
 
 if (${STATIC_BUILD})
+  SET(DCMTK_VERSION_NUMBER 360)
   SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0)
   DownloadPackage("ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/dcmtk-3.6.0.zip" "${DCMTK_SOURCES_DIR}" "" "")
 
@@ -39,7 +40,10 @@
 
   # This fixes crashes related to the destruction of the DCMTK OFLogger
   # http://support.dcmtk.org/docs-snapshot/file_macros.html
-  #add_definitions(-DLOG4CPLUS_DISABLE_FATAL=1)
+  add_definitions(
+    -DLOG4CPLUS_DISABLE_FATAL=1
+    -DDCMTK_VERSION_NUMBER=360
+    )
 
   include_directories(
     #${DCMTK_SOURCES_DIR}
@@ -64,6 +68,14 @@
     -DHAVE_CONFIG_H=1
     )
 
+
+  # Autodetection of the version of DCMTK
+  file(STRINGS "${DCMTK_DIR}/config/cfunix.h" DCMTK_VERSION_NUMBER
+    REGEX ".*PACKAGE_VERSION_NUMBER.*")
+  string(REGEX REPLACE ".*PACKAGE_VERSION_NUMBER" "" DCMTK_VERSION_NUMBER1 ${DCMTK_VERSION_NUMBER})
+  string(STRIP ${DCMTK_VERSION_NUMBER1} DCMTK_VERSION_NUMBER)
+
+
   IF (EXISTS "${DCMTK_DIR}/oflog")
     set(DCMTK_BUNDLES_LOG4CPLUS 1)
     link_libraries(${DCMTK_LIBRARIES} oflog)
@@ -72,4 +84,6 @@
   endif()
 endif()
 
+add_definitions(-DDCMTK_VERSION_NUMBER=${DCMTK_VERSION_NUMBER})
+message("DCMTK version: ${DCMTK_VERSION_NUMBER}")
 message("Does DCMTK includes its own copy of Log4Cplus: ${DCMTK_BUNDLES_LOG4CPLUS}")