Propagate Mathieu's modif around GDCM_DATA_ROOT

[gdcm.git] / Dicts / CMakeLists.txt

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index ca7ee0f5feace1bbd7c829219df895a8075d6527..e0f1797e44eb8bb921f73e46d7031a54071fdf26 100644 (file)
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(ALL_DICTS
   #NIH.dic     #the forbidden one...
   #  SPI.dic
   #  PHILIPS-Intera.dic # uncomment me if you want
-  GEMS.dic
+  #GEMS.dic #Commented out to avoid polluting 'non GEMS' images
   #GEMS-HiSpeed.dic
   #  GEMS-Advance.dic
   )
@@ -97,8 +97,8 @@ SET(DICOM_DIR_DICTIONARY "")
 
 FOREACH(line ${ENT_DIR})
   STRING(REGEX REPLACE
-    "^(metaElem|patientElem|studyElem|serieElem|imageElem) *([a-f0-9]+) ([a-f0-9]+) [\"](.*)[\"](.*)$"
-    "  {\"\\1\" , 0x\\2 , 0x\\3 , \"\\4\"}, \\5" nline "${line}")
+    "^(metaElem|patientElem|studyElem|serieElem|imageElem) *([a-f0-9]+) ([a-f0-9]+) [\"](.*)[\"] [\"](.*)[\"] (.*)$"
+    "  {\"\\1\" , 0x\\2 , 0x\\3 , \"\\4\", \"\\5\"}, \\6" nline "${line}")
   SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY}\n${nline}")
 ENDFOREACH(line)