X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=e37bf17a9782220e0c7e67532c9cee389d5b3130;hb=bf3a95a3d129e18937f88c349bfe5cdcaef42d55;hp=5be4a21a49335885ecd607ce8e8aae6b5e983fb1;hpb=e1830579102f036e9e558320a21990a9438ec9ef;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5be4a21a..e37bf17a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,7 @@
 #-----------------------------------------------------------------------------
+# Rebuild gdcm whenever a file starting with gdcm* is modified
+INCLUDE_REGULAR_EXPRESSION("^gdcm.*$")
+
 # Build jpeg lib first:
 SUBDIRS(gdcmjpeg)
 
@@ -10,6 +13,7 @@ INCLUDE_DIRECTORIES(
 )
 
 SET(libgdcm_la_SOURCES
+   gdcmBase.cxx
    gdcmBinEntry.cxx
    gdcmDebug.cxx
    gdcmDicomDir.cxx
@@ -25,6 +29,7 @@ SET(libgdcm_la_SOURCES
    gdcmDictSet.cxx
    gdcmDirList.cxx
    gdcmDocEntry.cxx
+   gdcmDocEntryArchive.cxx
    gdcmDocEntrySet.cxx
    gdcmDocument.cxx
    gdcmElementSet.cxx
@@ -32,17 +37,18 @@ SET(libgdcm_la_SOURCES
    gdcmFile.cxx
    gdcmGlobal.cxx
    gdcmHeader.cxx
-   gdcmHeaderHelper.cxx
    gdcmJPEGFragment.cxx
    gdcmJPEGFragmentsInfo.cxx
    gdcmJpeg8.cxx
    gdcmJpeg12.cxx
    gdcmJpeg16.cxx
    gdcmJpeg2000.cxx
-   gdcmPixelConvert.cxx
+   gdcmPixelReadConvert.cxx
+   gdcmPixelWriteConvert.cxx
    gdcmRLEFrame.cxx
    gdcmRLEFramesInfo.cxx
    gdcmSeqEntry.cxx
+   gdcmSerieHeader.cxx
    gdcmSQItem.cxx
    gdcmTS.cxx
    gdcmUtil.cxx
@@ -52,24 +58,26 @@ SET(libgdcm_la_SOURCES
    )
 
 ADD_LIBRARY(gdcm ${libgdcm_la_SOURCES} )
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmjpeg8 
-    gdcmjpeg12
-    gdcmjpeg16
-  )
-ELSE(UNIX)
-  TARGET_LINK_LIBRARIES(gdcm 
-    gdcmjpeg8 
-    gdcmjpeg12
-    gdcmjpeg16
-    Wsock32.lib   #doesn't exist on cygwin
-  )
-ENDIF(UNIX)
+TARGET_LINK_LIBRARIES(gdcm 
+  gdcmjpeg8 
+  gdcmjpeg12
+  gdcmjpeg16
+)
+IF(WIN32)
+  IF(NOT BORLAND)
+    TARGET_LINK_LIBRARIES(gdcm Wsock32 Snmpapi)
+  ENDIF(NOT BORLAND)
+ENDIF(WIN32)
 
-#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$")
+#Need additional library for the MacAddress code in gdcmUtil.cxx
+IF(APPLE)
+  TARGET_LINK_LIBRARIES(gdcm "-framework IOKit" "-framework CoreFoundation")
+ENDIF(APPLE)
 
+# Need nsl to resolve gethostbyname on SunOS-5.8 CC
+IF(CMAKE_SYSTEM MATCHES "SunOS.*")
+  TARGET_LINK_LIBRARIES(gdcm nsl)
+ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
+
+INSTALL_FILES(/include "\\.h$")
 INSTALL_TARGETS(/lib/ gdcm)