X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=55ab9e211f9a9871207ecc018124f4e5e3a2ef92;hb=5bf7c51796867388334836847a6874640bc83f89;hp=6bd5a093990c7cda4e4c4e431cddbdbc2c8bc4ed;hpb=67103c260bf25e83fcd847e995783614e41cde5d;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6bd5a093..55ab9e21 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,104 +1,73 @@
-#-----------------------------------------------------------------------------
-# Build jpeg lib first:
-SUBDIRS(jpeg)
-
-# "jpeglib.h" is defined here:
-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 
-)
-
-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
-   gdcmJpeg12.cxx
-   gdcmJpeg2000.cxx
-   gdcmJpeg.cxx
-   gdcmObject.cxx
-   gdcmParsePixels.cxx
-   gdcmParser.cxx
-   gdcmRLE.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)
-  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 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)
+#-----------------------------------------------------------------------------
+# Build jpeg lib first:
+SUBDIRS(jpeg)
+
+# "jpeglib.h" is defined here:
+INCLUDE_DIRECTORIES(
+  ${GDCM_SOURCE_DIR}/
+  ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
+)
+
+SET(libgdcm_la_SOURCES
+   gdcmBinEntry.cxx
+   gdcmDebug.cxx
+   gdcmDicomDir.cxx
+   gdcmDicomDirElement.cxx
+   gdcmDicomDirImage.cxx
+   gdcmDicomDirMeta.cxx
+   gdcmDicomDirObject.cxx
+   gdcmDicomDirPatient.cxx
+   gdcmDicomDirSerie.cxx
+   gdcmDicomDirStudy.cxx
+   gdcmDict.cxx
+   gdcmDictEntry.cxx
+   gdcmDictSet.cxx
+   gdcmDirList.cxx
+   gdcmDocEntry.cxx
+   gdcmDocEntrySet.cxx
+   gdcmDocument.cxx
+   gdcmElementSet.cxx
+   gdcmException.cxx
+   gdcmFile.cxx
+   gdcmGlobal.cxx
+   gdcmHeader.cxx
+   gdcmHeaderHelper.cxx
+   gdcmJPEGFragment.cxx
+   gdcmJPEGFragmentsInfo.cxx
+   gdcmJpeg8.cxx
+   gdcmJpeg12.cxx
+   gdcmJpeg16.cxx
+   gdcmJpeg2000.cxx
+   gdcmPixelConvert.cxx
+   gdcmRLEFrame.cxx
+   gdcmRLEFramesInfo.cxx
+   gdcmSeqEntry.cxx
+   gdcmSQItem.cxx
+   gdcmTS.cxx
+   gdcmUtil.cxx
+   gdcmValEntry.cxx   
+   gdcmVR.cxx
+   )
+
+ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(gdcm 
+    gdcmijpeg8 
+    gdcmijpeg12
+    gdcmijpeg16
+  )
+ELSE(UNIX)
+  TARGET_LINK_LIBRARIES(gdcm 
+    gdcmijpeg8 
+    gdcmijpeg12
+    gdcmijpeg16
+    Wsock32.lib   #doesn't exist on cygwin
+  )
+ENDIF(UNIX)
+
+#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 "\\.h$")
+
+INSTALL_TARGETS(/lib/ gdcm)