X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Dicts%2FCMakeLists.txt;h=576e7ebfa3192d4109c4cd88e66a4e475be97e85;hb=f540ed5835e7b89478e6048a577d494c0e156f2a;hp=ca7ee0f5feace1bbd7c829219df895a8075d6527;hpb=48f7ce7aa61778477992107caf15e8960359e66b;p=gdcm.git

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index ca7ee0f5..576e7ebf 100644
--- 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)
 
@@ -110,7 +110,7 @@ CONFIGURE_FILE("${GDCM_SOURCE_DIR}/src/gdcmDefaultDicts.cxx.in"
   "${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx" IMMEDIATE)
 
 #-----------------------------------------------------------------------------
-INSTALL_FILES(${GDCM_DATA_DIR} .dic
+INSTALL_FILES(${GDCM_INSTALL_DATA_DIR} .dic
   dicomV3
   dicomVR
   dicomTS