From 84c27c267cd859c2eb9a4559de5b1b745ffb7321 Mon Sep 17 00:00:00 2001
From: frog <frog>
Date: Tue, 8 Jun 2004 10:51:34 +0000
Subject: [PATCH]     src/CMakeLists.txt :      *  kernel (i.e. src/gdcm*)
 doesn't compile gdcmParser.cxx nor         gdcmHeaderEntry.cxx anymore.     
 * converted the file format from DOS return to un*x ones (it caused        my
 lincvs graphical diff mode to display kinky results).   --- Frog

---
 src/CMakeLists.txt | 146 ++++++++++++++++++++++-----------------------
 1 file changed, 72 insertions(+), 74 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9f757a35..09a360ea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,74 +1,72 @@
-#-----------------------------------------------------------------------------
-# Build jpeg lib first:
-SUBDIRS(jpeg)
-
-# "jpeglib.h" is defined here:
-INCLUDE_DIRECTORIES(
-  ${GDCM_SOURCE_DIR}/src/jpeg/libijg8
-  #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12
-  #${GDCM_SOURCE_DIR}/jpeg/ljpg     # JPEG lib from xmedcom 
-  ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
-)
-
-SET(libgdcm_la_SOURCES
-   gdcmDicomDirElement.cxx
-   gdcmDicomDir.cxx
-   gdcmDicomDirMeta.cxx
-   gdcmDicomDirPatient.cxx
-   gdcmDicomDirStudy.cxx
-   gdcmDicomDirSerie.cxx
-   gdcmDicomDirImage.cxx
-   gdcmDirList.cxx
-   gdcmObject.cxx
-   gdcmDebug.cxx
-   gdcmDict.cxx
-   gdcmDictEntry.cxx
-   gdcmDictSet.cxx
-   gdcmException.cxx
-   gdcmGlobal.cxx
-   gdcmJpeg12.cxx
-   gdcmJpeg2000.cxx
-   gdcmJpeg.cxx
-   gdcmTS.cxx
-   gdcmUtil.cxx
-   gdcmVR.cxx
-   gdcmFile.cxx
-   gdcmHeader.cxx
-   gdcmHeaderEntry.cxx
-   gdcmHeaderHelper.cxx
-   gdcmParsePixels.cxx
-   gdcmParser.cxx
-   gdcmRLE.cxx
-   gdcmDocEntry.cxx
-   gdcmDocEntrySet.cxx
-   gdcmBinEntry.cxx
-   gdcmDocument.cxx
-   gdcmSeqEntry.cxx
-   gdcmSQItem.cxx
-   gdcmElementSet.cxx
-   gdcmValEntry.cxx   
-)
-
-ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmijpeg8 
-    gdcmijpeg12
-    gdcmljpeg     # JPEG lib from xmedcom 
-  )
-ELSE(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmijpeg8 
-    gdcmijpeg12
-    gdcmljpeg
-    Wsock32.lib   #doesn't exist on cygwin
-  )
-ENDIF(UNIX)
-
-#The following is not working because when a header file is not found it tries 
-#to find one in the binary dir
-#INSTALL_FILES(/include .h ${libgdcm_la_SOURCES})
-#INSTALL_FILES(/include FILES gdcmIdo.h iddcmjpeg.h)
-INSTALL_FILES(/include "\\.h$")
-
-INSTALL_TARGETS(/lib/ gdcm)
+#-----------------------------------------------------------------------------
+# Build jpeg lib first:
+SUBDIRS(jpeg)
+
+# "jpeglib.h" is defined here:
+INCLUDE_DIRECTORIES(
+  ${GDCM_SOURCE_DIR}/src/jpeg/libijg8
+  #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12
+  #${GDCM_SOURCE_DIR}/jpeg/ljpg     # JPEG lib from xmedcom 
+  ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
+)
+
+SET(libgdcm_la_SOURCES
+   gdcmDicomDirElement.cxx
+   gdcmDicomDir.cxx
+   gdcmDicomDirMeta.cxx
+   gdcmDicomDirPatient.cxx
+   gdcmDicomDirStudy.cxx
+   gdcmDicomDirSerie.cxx
+   gdcmDicomDirImage.cxx
+   gdcmDirList.cxx
+   gdcmObject.cxx
+   gdcmDebug.cxx
+   gdcmDict.cxx
+   gdcmDictEntry.cxx
+   gdcmDictSet.cxx
+   gdcmException.cxx
+   gdcmGlobal.cxx
+   gdcmJpeg12.cxx
+   gdcmJpeg2000.cxx
+   gdcmJpeg.cxx
+   gdcmTS.cxx
+   gdcmUtil.cxx
+   gdcmVR.cxx
+   gdcmFile.cxx
+   gdcmHeader.cxx
+   gdcmHeaderHelper.cxx
+   gdcmParsePixels.cxx
+   gdcmRLE.cxx
+   gdcmDocEntry.cxx
+   gdcmDocEntrySet.cxx
+   gdcmBinEntry.cxx
+   gdcmDocument.cxx
+   gdcmSeqEntry.cxx
+   gdcmSQItem.cxx
+   gdcmElementSet.cxx
+   gdcmValEntry.cxx   
+)
+
+ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(gdcm 
+    gdcmijpeg8 
+    gdcmijpeg12
+    gdcmljpeg     # JPEG lib from xmedcom 
+  )
+ELSE(UNIX)
+  TARGET_LINK_LIBRARIES(gdcm 
+    gdcmijpeg8 
+    gdcmijpeg12
+    gdcmljpeg
+    Wsock32.lib   #doesn't exist on cygwin
+  )
+ENDIF(UNIX)
+
+#The following is not working because when a header file is not found it tries 
+#to find one in the binary dir
+#INSTALL_FILES(/include .h ${libgdcm_la_SOURCES})
+#INSTALL_FILES(/include FILES gdcmIdo.h iddcmjpeg.h)
+INSTALL_FILES(/include "\\.h$")
+
+INSTALL_TARGETS(/lib/ gdcm)
-- 
2.45.1