update changeLog

[gdcm.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b6ec926e6aad3ee27a2bd66324b49985d484d2eb..7fdd268e7abb755898c6e1e7edc05edbbe2aa0f2 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,21 +4,21 @@ SUBDIRS(jpeg)
 \r
 # "jpeglib.h" is defined here:\r
 INCLUDE_DIRECTORIES(\r
-  ${GDCM_SOURCE_DIR}/jpeg/libijg8\r
+  ${GDCM_SOURCE_DIR}/src/jpeg/libijg8\r
   #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12\r
+  #${GDCM_SOURCE_DIR}/jpeg/ljpg     # JPEG lib from xmedcom \r
 )\r
 \r
 SET(libgdcm_la_SOURCES\r
        gdcmException.cxx\r
        gdcmUtil.cxx\r
        gdcmHeader.cxx\r
+       gdcmHeader2.cxx\r
        gdcmHeaderHelper.cxx\r
-       gdcmElValue.cxx\r
+       gdcmHeaderEntry.cxx\r
        gdcmDictEntry.cxx\r
        gdcmDict.cxx\r
        gdcmDictSet.cxx\r
-       gdcmElValSet.cxx\r
-       gdcmHeaderIdo.cxx\r
        gdcmFile.cxx\r
        gdcmVR.cxx\r
        gdcmTS.cxx\r
@@ -27,7 +27,6 @@ SET(libgdcm_la_SOURCES
        gdcmJpeg2000.cxx\r
        gdcmRLE.cxx\r
        gdcmParse.cxx\r
-       gdcmJpegIdo.cxx\r
 )\r
 #-----------------------------------------------------------------------------\r
 # Why one should not use ADD_DEFINITIONS\r
@@ -38,30 +37,57 @@ SET(libgdcm_la_SOURCES
 # http://www.cmake.org/pipermail/cmake/2003-October/004369.html\r
 # http://www.cmake.org/pipermail/cmake/2003-October/004373.html\r
 \r
+SET(GDCM_COMPILE_FLAGS\r
+  "-D__STDC_LIMIT_MACROS  -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""\r
+  )\r
+\r
+# SunOS + old gcc fixes:\r
+\r
+INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)\r
+IF(CMAKE_NO_ANSI_STRING_STREAM)\r
+SET(GDCM_COMPILE_FLAGS\r
+  "${GDCM_COMPILE_FLAGS} -DGDCM_NO_ANSI_STRING_STREAM"\r
+  )\r
+ENDIF(CMAKE_NO_ANSI_STRING_STREAM)\r
+\r
+#INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityC.cmake)\r
+#INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)\r
+\r
+INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)\r
+CHECK_INCLUDE_FILE("stdint.h"    CMAKE_HAVE_STDINT_H)\r
+\r
+#MESSAGE(STATUS ${CMAKE_NO_ANSI_STRING_STREAM})\r
+IF(NOT CMAKE_HAVE_STDINT_H)\r
+SET(GDCM_COMPILE_FLAGS\r
+  "${GDCM_COMPILE_FLAGS} -DHAVE_NO_STDINT_H"\r
+  )\r
+ENDIF(NOT CMAKE_HAVE_STDINT_H)\r
+\r
 SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES}\r
   PROPERTIES\r
-  COMPILE_FLAGS "-D__STDC_LIMIT_MACROS  -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""\r
+  COMPILE_FLAGS ${GDCM_COMPILE_FLAGS}\r
 )\r
 \r
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )\r
-#TODO this is not working out of the box (on the first time)\r
 IF(UNIX)\r
   TARGET_LINK_LIBRARIES(gdcm \r
     gdcmijpeg8 \r
     gdcmijpeg12\r
+    gdcmljpeg     # JPEG lib from xmedcom \r
   )\r
 ELSE(UNIX)\r
   TARGET_LINK_LIBRARIES(gdcm \r
     gdcmijpeg8 \r
     gdcmijpeg12\r
+    gdcmljpeg\r
     Wsock32.lib   #doesn't exist on cygwin\r
   )\r
 ENDIF(UNIX)\r
 \r
-#The following is not wroking because when a header file is not found it tries \r
+#The following is not working because when a header file is not found it tries \r
 #to find one in the binary dir\r
 #INSTALL_FILES(/include .h ${libgdcm_la_SOURCES})\r
 #INSTALL_FILES(/include FILES gdcmIdo.h iddcmjpeg.h)\r
 INSTALL_FILES(/include "\\.h$")\r
 \r
-INSTALL_TARGETS(/lib/ gdcm)
\ No newline at end of file
+INSTALL_TARGETS(/lib/ gdcm)\r