X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=1ccabed4e0e8f5cafb2e7195e92627f64cd58857;hb=3f0c0dc58eba64083f79a898d6f60119cd448650;hp=7e0c778c3e255d0c0104c0a92975b7cb0dd520b4;hpb=adc8d5da8f5fd92da1cd74d2f6b2efaac14d8889;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e0c778c..1ccabed4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,61 +7,52 @@ 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
-	gdcmException.cxx
-	gdcmUtil.cxx
-	gdcmHeader.cxx
-	gdcmHeaderHelper.cxx
-	gdcmElValue.cxx
-	gdcmDictEntry.cxx
-	gdcmDict.cxx
-	gdcmDictSet.cxx
-	gdcmElValSet.cxx
-	gdcmHeaderIdo.cxx
-	gdcmFile.cxx
-	gdcmVR.cxx
-	gdcmTS.cxx
-	gdcmJpeg.cxx
-	gdcmJpeg12.cxx
-	gdcmJpeg2000.cxx
-	gdcmRLE.cxx
-	gdcmParse.cxx
+   gdcmDebug.cxx
+   gdcmDicomDir.cxx
+   gdcmDicomDirElement.cxx
+   gdcmDicomDirImage.cxx
+   gdcmDicomDirMeta.cxx
+   gdcmDicomDirPatient.cxx
+   gdcmDicomDirSerie.cxx
+   gdcmDicomDirStudy.cxx
+   gdcmDict.cxx
+   gdcmDictEntry.cxx
+   gdcmDictSet.cxx
+   gdcmDirList.cxx
+   gdcmException.cxx
+   gdcmFile.cxx
+   gdcmGlobal.cxx
+   gdcmHeader.cxx
+   gdcmHeaderEntry.cxx
+   gdcmHeaderHelper.cxx
+   gdcmJpeg12.cxx
+   gdcmJpeg2000.cxx
+   gdcmJpeg.cxx
+   gdcmObject.cxx
+   gdcmParsePixels.cxx
+   gdcmParser.cxx
+   gdcmRLE.cxx
+   gdcmTS.cxx
+   gdcmUtil.cxx
+   gdcmVR.cxx
 )
-#-----------------------------------------------------------------------------
-# Why one should not use ADD_DEFINITIONS
-# http://www.cmake.org/pipermail/cmake/2003-September/004286.html
-
-#-----------------------------------------------------------------------------
-# __STDC_LIMIT_MACROS -> Refer to stdint.h
-# http://www.cmake.org/pipermail/cmake/2003-October/004369.html
-# http://www.cmake.org/pipermail/cmake/2003-October/004373.html
-
-SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES}
-  PROPERTIES
-  COMPILE_FLAGS "-D__STDC_LIMIT_MACROS  -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""
-)
-
-IF(${CMAKE_NO_ANSI_STRING_STREAM})
-SET_SOURCE_FILES_PROPERTIES(gdcmHeader.cxx
-  PROPERTIES
-  COMPILE_FLAGS "-DGDCM_NO_ANSI_STRING_STREAM"
-)
-ENDIF(${CMAKE_NO_ANSI_STRING_STREAM})
 
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
 IF(UNIX)
   TARGET_LINK_LIBRARIES(gdcm 
     gdcmijpeg8 
     gdcmijpeg12
-    gdcmjpeg     # JPEG lib from xmedcom 
+    gdcmljpeg     # JPEG lib from xmedcom 
   )
 ELSE(UNIX)
   TARGET_LINK_LIBRARIES(gdcm 
     gdcmijpeg8 
     gdcmijpeg12
-    gdcmjpeg
+    gdcmljpeg
     Wsock32.lib   #doesn't exist on cygwin
   )
 ENDIF(UNIX)