X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Dicts%2FCMakeLists.txt;h=f6ba194f262695f8b5fd5b403f4c19b3375a8684;hb=a2055ff51e4f51a1b7b6c9ee9a803d3b3a8602a8;hp=c80ef577b0c69c6a12984014581c8886da3daa0d;hpb=a89c2f69662fa08ac5ce43fc5d5bff4af62cb054;p=gdcm.git

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index c80ef577..f6ba194f 100644
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -5,10 +5,13 @@
 # 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
@@ -94,25 +97,28 @@ 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)
 
 #-----------------------------------------------------------------------------
 # ... Set the dictionnary
-SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY} \n {0,0,0,0}")
+SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY} \n {0,0,0,0,0}")
 
-CONFIGURE_FILE("${GDCM_SOURCE_DIR}/src/gdcmDefaultDicts.cxx.in" 
+CONFIGURE_FILE("${GDCM_SOURCE_DIR}/src/gdcmDefaultDicts.cxx.in"
   "${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx" IMMEDIATE)
 
 #-----------------------------------------------------------------------------
-INSTALL_FILES(${GDCM_DATA_DIR} .dic
-  dicomV3
-  dicomVR
-  dicomTS
-  DicomDir
-  DictGroupName
-  gdcm
-)
+# For now GDCM_INSTALL_NO_DICTIONARY is a hidden variables
+IF(NOT GDCM_INSTALL_NO_DICTIONARY)
+  INSTALL_FILES(${GDCM_INSTALL_DATA_DIR} .dic
+    dicomV3
+    dicomVR
+    dicomTS
+    DicomDir
+    DictGroupName
+    gdcm
+    )
+ENDIF(NOT GDCM_INSTALL_NO_DICTIONARY)