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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e0c778c..715d901b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,24 +10,33 @@ INCLUDE_DIRECTORIES(
 )
 
 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
+
+   gdcmDicomDir.cxx
+   gdcmDicomDirElement.cxx
+   gdcmDict.cxx
+   gdcmDictEntry.cxx
+   gdcmDictSet.cxx
+   gdcmDirList.cxx
+   gdcmException.cxx
+   gdcmFile.cxx
+   gdcmHeader.cxx
+   gdcmHeaderEntry.cxx
+   gdcmHeaderHelper.cxx
+   gdcmImage.cxx
+   gdcmMeta.cxx
+   gdcmJpeg12.cxx
+   gdcmJpeg2000.cxx
+   gdcmJpeg.cxx
+   gdcmObject.cxx
+   gdcmParsePixels.cxx
+   gdcmParser.cxx
+   gdcmPatient.cxx
+   gdcmRLE.cxx
+   gdcmSerie.cxx
+   gdcmStudy.cxx
+   gdcmTS.cxx
+   gdcmUtil.cxx
+   gdcmVR.cxx
 )
 #-----------------------------------------------------------------------------
 # Why one should not use ADD_DEFINITIONS
@@ -38,30 +47,49 @@ SET(libgdcm_la_SOURCES
 # 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}\\\""
-)
+SET(GDCM_COMPILE_FLAGS
+  "-D__STDC_LIMIT_MACROS  -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""
+  )
+
+# SunOS + old gcc fixes:
 
-IF(${CMAKE_NO_ANSI_STRING_STREAM})
-SET_SOURCE_FILES_PROPERTIES(gdcmHeader.cxx
+INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
+IF(CMAKE_NO_ANSI_STRING_STREAM)
+SET(GDCM_COMPILE_FLAGS
+  "${GDCM_COMPILE_FLAGS} -DGDCM_NO_ANSI_STRING_STREAM"
+  )
+ENDIF(CMAKE_NO_ANSI_STRING_STREAM)
+
+#INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityC.cmake)
+#INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
+
+INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+CHECK_INCLUDE_FILE("stdint.h"    CMAKE_HAVE_STDINT_H)
+
+#MESSAGE(STATUS ${CMAKE_NO_ANSI_STRING_STREAM})
+IF(NOT CMAKE_HAVE_STDINT_H)
+SET(GDCM_COMPILE_FLAGS
+  "${GDCM_COMPILE_FLAGS} -DHAVE_NO_STDINT_H"
+  )
+ENDIF(NOT CMAKE_HAVE_STDINT_H)
+
+SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES}
   PROPERTIES
-  COMPILE_FLAGS "-DGDCM_NO_ANSI_STRING_STREAM"
+  COMPILE_FLAGS ${GDCM_COMPILE_FLAGS}
 )
-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)