ENH: Update DMCTK to use snapshot DCMTK-3.6.1_20150924

Applications/SlicerApp/Testing/Python/DCMTKPrivateDictTest.py

@@ -2,12 +2,6 @@
 
 dcmfile = sys.argv[1]
 
-print('DCMDICTPATH is'),
-try:
-  print(os.environ['DCMDICTPATH'])
-except KeyError:
-  raise Exception("DCMDICTPATH environment variable is not defined !")
-
 dcmdump=DICOMLib.DICOMCommand('dcmdump',[dcmfile])
 dump=str(dcmdump.start()).splitlines()
 

Base/QTCore/qSlicerCoreApplication.cxx

@@ -215,13 +215,6 @@ void qSlicerCoreApplicationPrivate::init()
   this->setEnvironmentVariable("ITK_AUTOLOAD_PATH", this->ITKFactoriesDir);
   this->setPythonEnvironmentVariables();
   this->setTclEnvironmentVariables();
-#if defined(Slicer_BUILD_DICOM_SUPPORT) && defined(Q_OS_MAC)
-  if (q->isInstalled())
-    {
-    this->setEnvironmentVariable("DCMDICTPATH", this->SlicerHome + "/" Slicer_SHARE_DIR "/dicom.dic:" +
-       this->SlicerHome + "/" Slicer_SHARE_DIR "/private.dic");
-    }
-#endif
 
   // Load default settings if any.
   if (q->defaultSettings())

CMake/SlicerBlockInstallDCMTKResources.cmake

@@ -1,12 +0,0 @@
-# -------------------------------------------------------------------------
-# Find and install DCMTK private dictionary
-# -------------------------------------------------------------------------
-
-find_package(DCMTK REQUIRED)
-if(NOT EXISTS ${DCM_STANDARD_DICT_PATH})
-  message(FATAL_ERROR "error: '${DCM_STANDARD_DICT_PATH}' does not exist !")
-endif()
-if(NOT EXISTS ${DCM_PRIVATE_DICT_PATH})
-  message(FATAL_ERROR "error: '${DCM_PRIVATE_DICT_PATH}' does not exist !")
-endif()
-install(FILES ${DCM_STANDARD_DICT_PATH} ${DCM_PRIVATE_DICT_PATH} DESTINATION ${Slicer_INSTALL_SHARE_DIR} COMPONENT Runtime)

CMake/SlicerCPack.cmake

@@ -15,7 +15,6 @@ endif()
 
 if(Slicer_BUILD_DICOM_SUPPORT AND NOT Slicer_USE_SYSTEM_DCMTK)
   include(${Slicer_CMAKE_DIR}/SlicerBlockInstallDCMTKApps.cmake)
-  include(${Slicer_CMAKE_DIR}/SlicerBlockInstallDCMTKResources.cmake)
 endif()
 
 set(CPACK_INSTALL_CMAKE_PROJECTS)

SuperBuild/External_DCMTK.cmake

@@ -33,8 +33,8 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
       )
   endif()
 
-  set(${proj}_REPOSITORY ${git_protocol}://github.com/commontk/DCMTK.git)
-  set(${proj}_GIT_TAG "3366181db75ac0e334045c66350e438adf304cb0")
+  set(${proj}_REPOSITORY ${git_protocol}://git.dcmtk.org/dcmtk)
+  set(${proj}_GIT_TAG "DCMTK-3.6.1_20150924")
 
   ExternalProject_Add(${proj}
     ${${proj}_EP_ARGS}
@@ -57,18 +57,14 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
       -DDCMTK_WITH_XML:BOOL=OFF  # see CTK github issue #25
       -DDCMTK_WITH_ICONV:BOOL=OFF  # see CTK github issue #178
       -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS:BOOL=OFF
+      -DDCMTK_ENABLE_BUILTIN_DICTIONARY:BOOL=ON
+      -DDCMTK_ENABLE_PRIVATE_TAGS:BOOL=ON
       ${EXTERNAL_PROJECT_OPTIONAL_ARGS}
     INSTALL_COMMAND ""
     DEPENDS
       ${${proj}_DEPENDENCIES}
   )
   set(DCMTK_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
-  set(DCM_PRIVATE_DICT_PATH ${CMAKE_BINARY_DIR}/${proj}/dcmdata/data/private.dic)
-  set(DCM_STANDARD_DICT_PATH ${CMAKE_BINARY_DIR}/${proj}/dcmdata/data/dicom.dic)
-
-  mark_as_superbuild(
-    VARS DCM_STANDARD_DICT_PATH:PATH DCM_PRIVATE_DICT_PATH:PATH
-    )
 
   #-----------------------------------------------------------------------------
   # Launcher setting specific to build tree
@@ -84,26 +80,6 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     LABELS "LIBRARY_PATHS_LAUNCHER_BUILD"
     )
 
-  # environment variables
-  set(${proj}_ENVVARS_LAUNCHER_BUILD
-    "DCMDICTPATH=${DCM_STANDARD_DICT_PATH}<PATHSEP>${DCM_PRIVATE_DICT_PATH}")
-  mark_as_superbuild(
-    VARS ${proj}_ENVVARS_LAUNCHER_BUILD
-    LABELS "ENVVARS_LAUNCHER_BUILD"
-    )
-
-  #-----------------------------------------------------------------------------
-  # Launcher setting specific to install tree
-
-  # environment variables
-  set(${proj}_ENVVARS_LAUNCHER_INSTALLED
-    "DCMDICTPATH=<APPLAUNCHER_DIR>/${Slicer_SHARE_DIR}/dicom.dic<PATHSEP><APPLAUNCHER_DIR>/${Slicer_SHARE_DIR}/private.dic")
-  mark_as_superbuild(
-    VARS ${proj}_ENVVARS_LAUNCHER_INSTALLED
-    LABELS "ENVVARS_LAUNCHER_INSTALLED"
-    )
-
-
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
 endif()