X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FCMakeLists.txt;h=57a810889cceb7d32e38b86694e890cf67b7078c;hb=d72e3cb0326093093f99863964f8f4df382c83e1;hp=b52f680acdfcea59fa8776e4240d9b69f8eddf2a;hpb=3c25b6a04715c20b3680bca5447b4f10add258fd;p=gdcm.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b52f680a..57a81088 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
@@ -33,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
@@ -60,13 +65,21 @@ TARGET_LINK_LIBRARIES(gdcm
 )
 IF(WIN32)
   IF(NOT BORLAND)
-    TARGET_LINK_LIBRARIES(gdcm Wsock32)
+    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.*")
+  IF(NOT CMAKE_COMPILER_IS_GNUCXX)
+    TARGET_LINK_LIBRARIES(gdcm nsl)
+  ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
+ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
+
+INSTALL_FILES(/include "\\.h$")
 INSTALL_TARGETS(/lib/ gdcm)