update CMakeLists

[gdcm.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 43e70ff9729c1b5e90ca56eb9a4a23e56cd46b82..6bd5a093990c7cda4e4c4e431cddbdbc2c8bc4ed 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,32 +4,40 @@ 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
 \r
 SET(libgdcm_la_SOURCES\r
-       gdcmException.cxx\r
-       gdcmUtil.cxx\r
-       gdcmHeader.cxx\r
-       gdcmHeaderHelper.cxx\r
-       gdcmElValue.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
-       gdcmJpeg.cxx\r
-       gdcmJpeg12.cxx\r
-       gdcmJpeg2000.cxx\r
-       gdcmRLE.cxx\r
-       gdcmParse.cxx\r
-       gdcmJpegIdo.cxx # to be removed\r
+   gdcmDebug.cxx\r
+   gdcmDicomDir.cxx\r
+   gdcmDicomDirElement.cxx\r
+   gdcmDicomDirImage.cxx\r
+   gdcmDicomDirMeta.cxx\r
+   gdcmDicomDirPatient.cxx\r
+   gdcmDicomDirSerie.cxx\r
+   gdcmDicomDirStudy.cxx\r
+   gdcmDict.cxx\r
+   gdcmDictEntry.cxx\r
+   gdcmDictSet.cxx\r
+   gdcmDirList.cxx\r
+   gdcmException.cxx\r
+   gdcmFile.cxx\r
+   gdcmGlobal.cxx\r
+   gdcmHeader.cxx\r
+   gdcmHeaderEntry.cxx\r
+   gdcmHeaderHelper.cxx\r
+   gdcmJpeg12.cxx\r
+   gdcmJpeg2000.cxx\r
+   gdcmJpeg.cxx\r
+   gdcmObject.cxx\r
+   gdcmParsePixels.cxx\r
+   gdcmParser.cxx\r
+   gdcmRLE.cxx\r
+   gdcmTS.cxx\r
+   gdcmUtil.cxx\r
+   gdcmVR.cxx\r
 )\r
 #-----------------------------------------------------------------------------\r
 # Why one should not use ADD_DEFINITIONS\r
@@ -40,24 +48,49 @@ 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
-    gdcmjpeg     # JPEG lib from xmedcom \r
+    gdcmljpeg     # JPEG lib from xmedcom \r
   )\r
 ELSE(UNIX)\r
   TARGET_LINK_LIBRARIES(gdcm \r
     gdcmijpeg8 \r
     gdcmijpeg12\r
-    gdcmjpeg\r 
+    gdcmljpeg\r
     Wsock32.lib   #doesn't exist on cygwin\r
   )\r
 ENDIF(UNIX)\r
@@ -69,4 +102,3 @@ ENDIF(UNIX)
 INSTALL_FILES(/include "\\.h$")\r
 \r
 INSTALL_TARGETS(/lib/ gdcm)\r
-#INSTALL_FILES(/include/vtk .h ${Kit_SRCS})
\ No newline at end of file