COMP: looks like a patch from Luca...

[gdcm.git] / Dicts / CMakeLists.txt

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index f0f600d51e0fcc215d709fd648719a28d3a3a4d3..05442e2c5d11c09705bd34bcadef90b0e32e476c 100644 (file)
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -7,19 +7,17 @@ SET(ALL_DICTS
   dicomV3.dic
   Papyrus.dic
   NIH.dic     #the forbidden one...
+  SPI.dic
   )
 
-# The following line make sure we are not appending on an already existing file
-FILE(WRITE "${GDCM_BINARY_DIR}/Dicts/gdcm.dic" "")
+# Better solution
+SET(TEST_DICT_BODY)
 FOREACH(dict ${ALL_DICTS})
   FILE(READ "${GDCM_SOURCE_DIR}/Dicts/${dict}" dict_append)
-  FILE(APPEND "${GDCM_BINARY_DIR}/Dicts/gdcm.dic" ${dict_append})
+  SET(TEST_DICT_BODY "${TEST_DICT_BODY}\n${dict_append}")
 ENDFOREACH(dict)
-
-FOREACH(test 1.dic 2.dic 3.dic)
-  FILE(READ "${GDCM_SOURCE_DIR}/Dicts/${test}" test_append)
-  FILE(APPEND "${GDCM_BINARY_DIR}/Dicts/test.dic" ${test_append})
-ENDFOREACH(test)
+CONFIGURE_FILE("${GDCM_SOURCE_DIR}/Dicts/gdcm.dic.in"
+  "${GDCM_BINARY_DIR}/Dicts/gdcm.dic" @ONLY IMMEDIATE)
 
 #-----------------------------------------------------------------------------
 # Nice trick to avoid creating a .h file each time we compile gdcm
@@ -28,7 +26,7 @@ ENDFOREACH(test)
 # Which is a variable afterward...
 
 # Following code contributing by Andy Cedilnik (Kitware)
-FILE(READ "gdcm.dic" ENT)
+FILE(READ "${GDCM_BINARY_DIR}/Dicts/gdcm.dic" ENT)
 STRING(REGEX REPLACE "\r?\n" ";" ENT "${ENT}")
 SET(DICOM_DATA_DICTIONARY "")
 
@@ -100,11 +98,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)