X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=1ccabed4e0e8f5cafb2e7195e92627f64cd58857;hb=ce855abf19191d31dcd568ea0277cdc8e691b3c0;hp=715d901bd67c8ac65c74348a25fa89cf435f01c4;hpb=22f785a2627d1e7823701193bd7624739a3e033b;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 715d901b..1ccabed4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,76 +7,39 @@ 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
-
+   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
-   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
-# 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(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 ${GDCM_COMPILE_FLAGS}
-)
 
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
 IF(UNIX)