X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Dicts%2FCMakeLists.txt;h=c80ef577b0c69c6a12984014581c8886da3daa0d;hb=20233e0e4bc268a63105f697c663feedecbe99f7;hp=a88761282e150d9deeabf17380d325bffe261207;hpb=6d2c8575c5156ae5f7c6162e287657c8df88c963;p=gdcm.git

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index a8876128..c80ef577 100644
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -7,18 +7,17 @@ SET(ALL_DICTS
   dicomV3.dic
   Papyrus.dic
   NIH.dic     #the forbidden one...
+  SPI.dic
+  #  PHILIPS-Intera.dic # uncomment me if you want
   )
 
-# The following line make sure we are not appending on an already existing file
-#FILE(WRITE "${GDCM_BINARY_DIR}/Dicts/gdcm.dic" "")
-#FOREACH(dict ${ALL_DICTS})
-#  FILE(READ "${GDCM_SOURCE_DIR}/Dicts/${dict}" dict_append)
-#  FILE(APPEND "${GDCM_BINARY_DIR}/Dicts/gdcm.dic" ${dict_append})
-#ENDFOREACH(dict)
-
 # 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)
@@ -40,23 +39,9 @@ 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]+) ([1-9n-]+) (.*)$"
     "   {0x\\1, 0x\\2, \"\\3\" , \"\\4\" , \"\\5\"}, " nline "${line}")
-  #MESSAGE( "${nline}" )
   SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY}\n${nline}")
 ENDFOREACH(line)
 
-
-#FILE(READ "dicomV3PhilipsIntera.dic" ENT)
-#STRING(REGEX REPLACE "\r?\n" ";" ENT "${ENT}")
-#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]+) ([1-9n-]+) (.*)$"
-#    "   {0x\\1, 0x\\2, \"\\3\" , \"\\4\" , \"\\5\"}, " nline "${line}")
-#  #SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY}\n${nline}")
-#  MESSAGE( "${nline}" )
-#ENDFOREACH(line)
-
-
 SET(DICOM_DATA_DICTIONARY "${DICOM_DATA_DICTIONARY} \n {0,0,0,0,0}")
 
 #-----------------------------------------------------------------------------
@@ -118,11 +103,6 @@ ENDFOREACH(line)
 # ... Set the dictionnary
 SET(DICOM_DIR_DICTIONARY "${DICOM_DIR_DICTIONARY} \n {0,0,0,0}")
 
-#FOREACH(file dicomV3.dic dicomTS.dic dicomVR.dic DicomDir.dic DictGroupName.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)