X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=ef844c44e65c7553436cfa8385400fc3124c0824;hb=d91ddf43904e09830d43e580a7e21e511e22278f;hp=bbdd6693db7995aed7d1660f6c7cf3a75552484d;hpb=af698856153f426a4d852b6645e238f669d42276;p=gdcm.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bbdd6693..ef844c44 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,7 +13,9 @@ INCLUDE_DIRECTORIES( ) SET(libgdcm_la_SOURCES + gdcmBase.cxx gdcmBinEntry.cxx + gdcmContentEntry.cxx gdcmDebug.cxx gdcmDicomDir.cxx gdcmDicomDirElement.cxx @@ -22,6 +27,7 @@ SET(libgdcm_la_SOURCES gdcmDicomDirStudy.cxx gdcmDict.cxx gdcmDictEntry.cxx + gdcmDictGroupName.cxx gdcmDictSet.cxx gdcmDirList.cxx gdcmDocEntry.cxx @@ -30,20 +36,21 @@ SET(libgdcm_la_SOURCES gdcmDocument.cxx gdcmElementSet.cxx gdcmException.cxx - gdcmFile.cxx + gdcmFileHelper.cxx gdcmGlobal.cxx - gdcmHeader.cxx + gdcmFile.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 + gdcmSerieHelper.cxx gdcmSQItem.cxx gdcmTS.cxx gdcmUtil.cxx @@ -60,13 +67,15 @@ 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 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 "\\.h$") INSTALL_TARGETS(/lib/ gdcm)