# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1442995226 -7200
# Node ID dfbde7c3fe19d1132248d340e33638c1d38d8dc5
# Parent  0844a4bcb0adb6f97bc512eac174a4547a3d67f2# Parent  8c4f1de71f8d76b5a75a5882b77b45085f780580
integration mainline->dcmtk

diff -r 0844a4bcb0ad -r dfbde7c3fe19 Resources/CMake/DcmtkConfiguration.cmake
--- a/Resources/CMake/DcmtkConfiguration.cmake	Wed Sep 23 09:59:12 2015 +0200
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Wed Sep 23 10:00:26 2015 +0200
@@ -128,7 +128,7 @@
 
   #set_source_files_properties(${DCMTK_SOURCES}
   #  PROPERTIES COMPILE_DEFINITIONS
-  #  "PACKAGE_VERSION=\"3.6.1\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"")
+  #  "PACKAGE_VERSION=\"${DCMTK_PACKAGE_VERSION}\";PACKAGE_VERSION_NUMBER=\"${DCMTK_VERSION_NUMBER}\"")
 
   # This fixes crashes related to the destruction of the DCMTK OFLogger
   # http://support.dcmtk.org/docs-snapshot/file_macros.html