X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=710fc191a17636a1ec257f13f7dc8703c94cc8e6;hb=4d59e5e9778e5abff13d13d576ef92ce81498b6f;hp=b6ec926e6aad3ee27a2bd66324b49985d484d2eb;hpb=6ff1602e07c6fd4b27ece346c879ac2f3d48d2c9;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b6ec926e..710fc191 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,21 +4,21 @@ SUBDIRS(jpeg)
 
 # "jpeglib.h" is defined here:
 INCLUDE_DIRECTORIES(
-  ${GDCM_SOURCE_DIR}/jpeg/libijg8
+  ${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 
 )
 
 SET(libgdcm_la_SOURCES
 	gdcmException.cxx
 	gdcmUtil.cxx
+	gdcmParser.cxx
 	gdcmHeader.cxx
 	gdcmHeaderHelper.cxx
-	gdcmElValue.cxx
+	gdcmHeaderEntry.cxx
 	gdcmDictEntry.cxx
 	gdcmDict.cxx
 	gdcmDictSet.cxx
-	gdcmElValSet.cxx
-	gdcmHeaderIdo.cxx
 	gdcmFile.cxx
 	gdcmVR.cxx
 	gdcmTS.cxx
@@ -27,7 +27,11 @@ SET(libgdcm_la_SOURCES
 	gdcmJpeg2000.cxx
 	gdcmRLE.cxx
 	gdcmParse.cxx
-	gdcmJpegIdo.cxx
+	gdcmDicomDir.cxx
+	gdcmPatient.cxx
+	gdcmStudy.cxx
+	gdcmSequence.cxx
+	gdcmImage.cxx
 )
 #-----------------------------------------------------------------------------
 # Why one should not use ADD_DEFINITIONS
@@ -38,30 +42,57 @@ 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(GDCM_COMPILE_FLAGS
+  "-D__STDC_LIMIT_MACROS  -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""
+  )
+
+# SunOS + old gcc fixes:
+
+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 "-D__STDC_LIMIT_MACROS  -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""
+  COMPILE_FLAGS ${GDCM_COMPILE_FLAGS}
 )
 
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
-#TODO this is not working out of the box (on the first time)
 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 wroking because when a header file is not found it tries 
+#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)
\ No newline at end of file
+INSTALL_TARGETS(/lib/ gdcm)