BUG: Solve seg fault with SerieHelper by properly using sort algorithm when needed...

[gdcm.git] / Dicts / CMakeLists.txt

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index 094d08b65e6f0b48e4c1ce47e8427d2de6173abc..4e29811d10a275dd31828ef59efd81cb205e38b4 100644 (file)
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -21,12 +21,12 @@ SET(DICOM_DATA_DICTIONARY "")
 
 FOREACH(line ${ENT})
   STRING(REGEX REPLACE
-    "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([A-Z]+) ([A-Z?]+) (.*)$"
-    "   0x\\1, 0x\\2, \"\\3\" , \"\\4\" , \"\\5\", " nline "${line}")
+    "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([0-9a-f][0-9a-f][0-9a-f][0-9a-f]) ([A-Z]+) ([1-9n-]+) (.*)$"
+    "   { 0x\\1, 0x\\2, \"\\3\" , \"\\4\" , \"\\5\" }, " nline "${line}")
   SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY}\n${nline}")
 ENDFOREACH(line)
 
-SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY} \n 0,0,0,0,0")
+SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY} \n { 0,0,0,0,0 }")
 
 FILE(READ "dicomTS.dic" ENT_TS)
 STRING(REGEX REPLACE "\n" ";" ENT_TS "${ENT_TS}")
@@ -60,13 +60,17 @@ 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}")
+    "  { \"\\1\" , 0x\\2 , 0x\\3 , \"\\4\" }, \\5" nline "${line}")
   SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY}\n${nline}")
 ENDFOREACH(line)
 
-SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY} \n 0,0,0,0")
+SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY} \n { 0,0,0,0 }")
 
 # See above
+FOREACH(file dicomV3.dic  dicomTS.dic dicomVR.dic DicomDir.dic)
+  CONFIGURE_FILE("${GDCM_SOURCE_DIR}/Dicts/${file}"
+    "${GDCM_BINARY_DIR}/Dicts/${file}.out")
+ENDFOREACH(file)
 CONFIGURE_FILE("${GDCM_SOURCE_DIR}/src/gdcmDefaultDicts.cxx.in" "${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx" IMMEDIATE)