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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b6ec926e..4898df50 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,67 +1,103 @@
-#-----------------------------------------------------------------------------
-# Build jpeg lib first:
-SUBDIRS(jpeg)
-
-# "jpeglib.h" is defined here:
-INCLUDE_DIRECTORIES(
-  ${GDCM_SOURCE_DIR}/jpeg/libijg8
-  #${GDCM_SOURCE_DIR}/jpeg/libijg12 #all files have been renamed, appending 12
-)
-
-SET(libgdcm_la_SOURCES
-	gdcmException.cxx
-	gdcmUtil.cxx
-	gdcmHeader.cxx
-	gdcmHeaderHelper.cxx
-	gdcmElValue.cxx
-	gdcmDictEntry.cxx
-	gdcmDict.cxx
-	gdcmDictSet.cxx
-	gdcmElValSet.cxx
-	gdcmHeaderIdo.cxx
-	gdcmFile.cxx
-	gdcmVR.cxx
-	gdcmTS.cxx
-	gdcmJpeg.cxx
-	gdcmJpeg12.cxx
-	gdcmJpeg2000.cxx
-	gdcmRLE.cxx
-	gdcmParse.cxx
-	gdcmJpegIdo.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_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES}
-  PROPERTIES
-  COMPILE_FLAGS "-D__STDC_LIMIT_MACROS  -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\""
-)
-
-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
-  )
-ELSE(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmijpeg8 
-    gdcmijpeg12
-    Wsock32.lib   #doesn't exist on cygwin
-  )
-ENDIF(UNIX)
-
-#The following is not wroking 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
+#-----------------------------------------------------------------------------
+# Rebuild gdcm whenever a file starting with gdcm* is modified
+INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
+
+# Build jpeg lib first:
+#IF (WIN32)
+#  IF (BUILD_SHARED_LIBS)
+#    ADD_DEFINITIONS(-DJPEGDLL)
+#  ELSE (BUILD_SHARED_LIBS)
+#    ADD_DEFINITIONS(-DJPEGSTATIC)
+#  ENDIF (BUILD_SHARED_LIBS)
+#ENDIF (WIN32)
+SUBDIRS(
+  gdcmjpeg
+  #gdcmmpeg2
+  gdcmjasper
+  gdcmjpegls
+  )
+
+# "jpeglib.h" is defined here:
+INCLUDE_DIRECTORIES(
+  ${GDCM_SOURCE_DIR}/src
+  ${GDCM_SOURCE_DIR}/src/gdcmmpeg2/src/mpeg2dec
+  ${GDCM_BINARY_DIR}/ #for gdcmConfigure.h
+  ${GDCM_BINARY_DIR}/src #for gdcmjpeg 8, 12 and 16 
+  ${GDCM_BINARY_DIR}/src/gdcmjasper/src/libjasper/include
+  ${GDCM_SOURCE_DIR}/src/gdcmjasper/src/libjasper/include
+)
+
+SET(libgdcm_la_SOURCES
+   gdcmArgMgr.cxx
+   gdcmBase.cxx
+   gdcmBinEntry.cxx
+   gdcmContentEntry.cxx
+   gdcmDebug.cxx
+   gdcmDicomDir.cxx
+   gdcmDicomDirElement.cxx
+   gdcmDicomDirImage.cxx
+   gdcmDicomDirMeta.cxx
+   gdcmDicomDirObject.cxx
+   gdcmDicomDirPatient.cxx
+   gdcmDicomDirVisit.cxx
+   gdcmDicomDirSerie.cxx
+   gdcmDicomDirStudy.cxx
+   gdcmDict.cxx
+   gdcmDictEntry.cxx
+   gdcmDictGroupName.cxx
+   gdcmDictSet.cxx
+   gdcmDirList.cxx
+   gdcmDocEntry.cxx
+   gdcmDocEntryArchive.cxx
+   gdcmDocEntrySet.cxx
+   gdcmDocument.cxx
+   gdcmElementSet.cxx
+   gdcmException.cxx
+   gdcmFileHelper.cxx
+   gdcmGlobal.cxx
+   gdcmFile.cxx
+   gdcmJPEGFragment.cxx
+   gdcmJPEGFragmentsInfo.cxx
+   gdcmJpeg8.cxx
+   gdcmJpeg12.cxx
+   gdcmJpeg16.cxx
+   gdcmJpeg2000.cxx
+   #   gdcmMpeg.cxx
+   gdcmOrientation.cxx
+   gdcmPixelReadConvert.cxx
+   gdcmPixelWriteConvert.cxx
+   gdcmRLEFrame.cxx
+   gdcmRLEFramesInfo.cxx
+   gdcmSeqEntry.cxx
+   gdcmSerieHelper.cxx
+   gdcmSQItem.cxx
+   gdcmTS.cxx
+   gdcmUtil.cxx
+   gdcmValEntry.cxx   
+   gdcmValidator.cxx
+   gdcmVR.cxx
+   ${GDCM_BINARY_DIR}/src/gdcmDefaultDicts.cxx
+   )
+
+ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
+TARGET_LINK_LIBRARIES(gdcm 
+  gdcmjpeg8 
+  gdcmjpeg12
+  gdcmjpeg16
+  #  gdcmmpeg2
+  gdcmjasper
+)
+IF(WIN32)
+  IF(NOT BORLAND)
+    TARGET_LINK_LIBRARIES(gdcm wsock32 snmpapi)
+  ENDIF(NOT BORLAND)
+ENDIF(WIN32)
+
+# Need nsl to resolve gethostbyname on SunOS-5.8
+# and socket also
+IF(CMAKE_SYSTEM MATCHES "SunOS.*")
+  TARGET_LINK_LIBRARIES(gdcm socket nsl)
+ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
+
+INSTALL_FILES(/include/gdcm "\\.h$")
+INSTALL_TARGETS(/lib/gdcm/ gdcm)