X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Dicts%2FCMakeLists.txt;h=e0f1797e44eb8bb921f73e46d7031a54071fdf26;hb=3859a1581c1955f8ad7b0cd70d595d7d24b3dacf;hp=05442e2c5d11c09705bd34bcadef90b0e32e476c;hpb=4591aef66777a33fba960585e667adef2e94c9fb;p=gdcm.git

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index 05442e2c..e0f1797e 100644
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -5,14 +5,22 @@
 # Generate our own 'DICOM' dictionary, based on the following dictionaries:
 SET(ALL_DICTS
   dicomV3.dic
-  Papyrus.dic
-  NIH.dic     #the forbidden one...
-  SPI.dic
+  #Papyrus.dic
+  #NIH.dic     #the forbidden one...
+  #  SPI.dic
+  #  PHILIPS-Intera.dic # uncomment me if you want
+  #GEMS.dic #Commented out to avoid polluting 'non GEMS' images
+  #GEMS-HiSpeed.dic
+  #  GEMS-Advance.dic
   )
 
 # Better solution
 SET(TEST_DICT_BODY)
 FOREACH(dict ${ALL_DICTS})
+  # Properly set dependencies, therefore `touch Philips-Intera.dic` does not rebuild
+  # but adding/removing a line in Philips-Intera.dic rebuild as expected
+  CONFIGURE_FILE("${GDCM_SOURCE_DIR}/Dicts/${dict}"
+       "${GDCM_BINARY_DIR}/Dicts/${dict}" COPYONLY IMMEDIATE)
   FILE(READ "${GDCM_SOURCE_DIR}/Dicts/${dict}" dict_append)
   SET(TEST_DICT_BODY "${TEST_DICT_BODY}\n${dict_append}")
 ENDFOREACH(dict)
@@ -89,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)