From owner-svn-ports-branches@freebsd.org Mon Feb 1 11:39:04 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93864A764B1; Mon, 1 Feb 2016 11:39:04 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 63FEE1FB1; Mon, 1 Feb 2016 11:39:04 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u11Bd31w057426; Mon, 1 Feb 2016 11:39:03 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u11Bd3R6057420; Mon, 1 Feb 2016 11:39:03 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201602011139.u11Bd3R6057420@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Mon, 1 Feb 2016 11:39:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r407710 - in branches/2016Q1/devel/gdcm: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Feb 2016 11:39:04 -0000 Author: junovitch Date: Mon Feb 1 11:39:02 2016 New Revision: 407710 URL: https://svnweb.freebsd.org/changeset/ports/407710 Log: MFH: r407679 devel/gdcm: update 2.4.4 -> 2.6.3 - Switch off by default DOCS option for Doxygen docs to DOXYGEN - Switch DOXYGEN bits to options helpers - Standardize on the more prevelant ON/OFF CMAKE flags - Set USE_LDCONFIG=yes as ${PREFIX}/lib is the default - Add gdcmviewer to DESKTOP_ENTRIES PR: 203479 Submitted by: tkato432@yahoo.com (with changes) Approved by: ports-secteam (miwi) Security: CVE-2015-8396 Security: CVE-2015-8397 Security: https://vuxml.FreeBSD.org/freebsd/e00d8b94-c88a-11e5-b5fe-002590263bf5.html Deleted: branches/2016Q1/devel/gdcm/files/patch-Source-DataDictionary_gdcmGlobal.cxx branches/2016Q1/devel/gdcm/files/patch-Source-InformationObjectDefinition_CMakeLists.txt Modified: branches/2016Q1/devel/gdcm/Makefile branches/2016Q1/devel/gdcm/distinfo branches/2016Q1/devel/gdcm/files/patch-CMakeLists.txt branches/2016Q1/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake branches/2016Q1/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt branches/2016Q1/devel/gdcm/pkg-plist Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/devel/gdcm/Makefile ============================================================================== --- branches/2016Q1/devel/gdcm/Makefile Mon Feb 1 11:36:39 2016 (r407709) +++ branches/2016Q1/devel/gdcm/Makefile Mon Feb 1 11:39:02 2016 (r407710) @@ -3,7 +3,6 @@ PORTNAME= gdcm PORTVERSION= ${GDCM_MAJOR}.${GDCM_MINOR}.${GDCM_PATCH} -PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF/gdcm/gdcm%202.x/GDCM%20${PORTVERSION} @@ -13,27 +12,36 @@ COMMENT= Grassroots DICOM library LICENSE= BSD3CLAUSE LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \ - libexpat.so:${PORTSDIR}/textproc/expat2 + libexpat.so:${PORTSDIR}/textproc/expat2 -OPTIONS_DEFINE= DOCS -OPTIONS_UNSET= DOCS +OPTIONS_DEFINE= DOXYGEN OPTIONS_RADIO= VTK OPTIONS_RADIO_VTK= VTK5 VTK6 +OPTIONS_SUB= yes + +DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \ + docbook-xsl-ns>0:${PORTSDIR}/textproc/docbook-xsl-ns +DOXYGEN_USES= ghostscript +DOXYGEN_USE= gnome=libxslt:build tex=latex:build +DOXYGEN_CMAKE_ON= -DGDCM_DOCUMENTATION:BOOL=ON \ + -DGDCM_PDF_DOCUMENTATION:BOOL=OFF \ + -DGDCM_INSTALL_MAN_DIR:PATH=man \ + -DGDCM_INSTALL_DOC_DIR:PATH=${DOCSDIR_REL} +DOXYGEN_CMAKE_OFF= -DGDCM_DOCUMENTATION:BOOL=OFF VTK5_DESC= Build VTK 5 integration classes VTK5_LIB_DEPENDS= libvtkHybrid.so:${PORTSDIR}/math/vtk5 -VTK5_CMAKE_ON= -DGDCM_USE_VTK:BOOL=YES \ +VTK5_CMAKE_ON= -DGDCM_USE_VTK:BOOL=ON \ -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK5_VERSION} - VTK6_DESC= Build VTK 6 integration classes VTK6_LIB_DEPENDS= libvtkCommonCore-${VTK6_VERSION}.so:${PORTSDIR}/math/vtk6 -VTK6_CMAKE_ON= -DGDCM_USE_VTK:BOOL=YES \ +VTK6_CMAKE_ON= -DGDCM_USE_VTK:BOOL=ON \ -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK6_VERSION} # Change this when updating the port GDCM_MAJOR= 2 -GDCM_MINOR= 4 -GDCM_PATCH= 4 +GDCM_MINOR= 6 +GDCM_PATCH= 3 # Change this whenever VTK is updated VTK5_VERSION= 5.10 @@ -41,21 +49,21 @@ VTK6_VERSION= 6.2 USES= alias cmake:outsource tar:bzip2 USE_OPENSSL= yes -USE_LDCONFIG= ${PREFIX}/lib +USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include -CMAKE_ARGS+= -DGDCM_PDF_DOCUMENTATION:BOOL=NO \ - -DGDCM_USE_SYSTEM_OPENSSL:BOOL=YES \ - -DGDCM_USE_SYSTEM_EXPAT:BOOL=YES \ - -DGDCM_USE_SYSTEM_OPENJPEG:BOOL=YES \ - -DGDCM_USE_SYSTEM_ZLIB:BOOL=YES \ - -DGDCM_BUILD_APPLICATIONS:BOOL=YES \ - -DGDCM_BUILD_SHARED_LIBS:BOOL=YES \ - -DGDCM_BUILD_EXAMPLES:BOOL=NO \ - -DGDCM_INSTALL_DATA_DIR:STRING=${DATADIR} +CMAKE_ARGS= -DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \ + -DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \ + -DGDCM_USE_SYSTEM_OPENJPEG:BOOL=ON \ + -DGDCM_USE_SYSTEM_ZLIB:BOOL=ON \ + -DGDCM_BUILD_APPLICATIONS:BOOL=ON \ + -DGDCM_BUILD_SHARED_LIBS:BOOL=ON \ + -DGDCM_BUILD_EXAMPLES:BOOL=OFF \ + -DGDCM_INSTALL_DATA_DIR:PATH=${DATADIR_REL} .include .if ${PORT_OPTIONS:MVTK5} || ${PORT_OPTIONS:MVTK6} +DESKTOP_ENTRIES="Gdcmviewer" "Simple DICOM Viewer" "" "gdcmviewer" "" "" PLIST_SUB+= VTK="" .else PLIST_SUB+= VTK="@comment " @@ -65,21 +73,12 @@ PLIST_SUB+= GDCM_MAJOR="${GDCM_MAJOR}" \ GDCM_MINOR="${GDCM_MINOR}" \ GDCM_PATCH="${GDCM_PATCH}" -.if ${PORT_OPTIONS:MDOCS} -USE_TEX= latex:build -USES+= ghostscript -BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen -CMAKE_ARGS+= -DGDCM_DOCUMENTATION:BOOL=YES \ - -DGDCM_INSTALL_MAN_DIR:STRING=man \ - -DGDCM_INSTALL_DOC_DIR:STRING=${DOCSDIR} -PORTDOCS= * -.else -CMAKE_ARGS+= -DGDCM_DOCUMENTATION:BOOL=NO -.endif - -post-build: -.if ${PORT_OPTIONS:MDOCS} - cd ${WRKSRC}/Utilities/doxygen && ${LOCALBASE}/bin/doxygen -u doxyfile.in -.endif +pre-build-DOXYGEN-on: + (cd ${WRKSRC}/Utilities/doxygen \ + && ${LOCALBASE}/bin/doxygen -u doxyfile.in) + +post-install-DOXYGEN-on: + @(${FIND} ${STAGEDIR}${DOCSDIR} -type f | ${SED} -e \ + "s|^${STAGEDIR}${PREFIX}/||" >> ${TMPPLIST}) .include Modified: branches/2016Q1/devel/gdcm/distinfo ============================================================================== --- branches/2016Q1/devel/gdcm/distinfo Mon Feb 1 11:36:39 2016 (r407709) +++ branches/2016Q1/devel/gdcm/distinfo Mon Feb 1 11:39:02 2016 (r407710) @@ -1,2 +1,2 @@ -SHA256 (gdcm-2.4.4.tar.bz2) = c5cd2f43a16180f5a9ecd5211bf214971b0620e9d9e027c2e11a89c4ce7d5b1f -SIZE (gdcm-2.4.4.tar.bz2) = 4397720 +SHA256 (gdcm-2.6.3.tar.bz2) = 7882e880b8b60efc66a492ae3c1c161799340ad62a90d690823b76eb400c0a8f +SIZE (gdcm-2.6.3.tar.bz2) = 3680016 Modified: branches/2016Q1/devel/gdcm/files/patch-CMakeLists.txt ============================================================================== --- branches/2016Q1/devel/gdcm/files/patch-CMakeLists.txt Mon Feb 1 11:36:39 2016 (r407709) +++ branches/2016Q1/devel/gdcm/files/patch-CMakeLists.txt Mon Feb 1 11:39:02 2016 (r407710) @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2012-01-02 12:11:48.000000000 +0100 -+++ CMakeLists.txt 2012-01-02 12:13:50.000000000 +0100 -@@ -45,7 +45,7 @@ - "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}") - SET(GDCM_LIBRARY_PROPERTIES ${GDCM_LIBRARY_PROPERTIES} +--- CMakeLists.txt.orig 2015-08-22 14:09:50 UTC ++++ CMakeLists.txt +@@ -53,7 +53,7 @@ if(NOT DEFINED GDCM_API_VERSION) + endif() + set(GDCM_LIBRARY_PROPERTIES ${GDCM_LIBRARY_PROPERTIES} VERSION "${GDCM_VERSION}" - SOVERSION "${GDCM_API_VERSION}" + SOVERSION "${GDCM_MAJOR_VERSION}" ) - #SET(GDCM_EXECUTABLE_PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES} + #set(GDCM_EXECUTABLE_PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES} # VERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}" Modified: branches/2016Q1/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake ============================================================================== --- branches/2016Q1/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake Mon Feb 1 11:36:39 2016 (r407709) +++ branches/2016Q1/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake Mon Feb 1 11:39:02 2016 (r407710) @@ -1,5 +1,5 @@ ---- CMake/FindOpenJPEG.cmake.orig 2014-04-03 09:33:49.000000000 +0200 -+++ CMake/FindOpenJPEG.cmake 2014-06-10 09:34:13.000000000 +0200 +--- CMake/FindOpenJPEG.cmake.orig 2015-08-22 14:09:50 UTC ++++ CMake/FindOpenJPEG.cmake @@ -18,7 +18,15 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) @@ -17,7 +17,7 @@ find_package(OpenJPEG QUIET NO_MODULE) if( NOT OpenJPEG_DIR ) -@@ -51,3 +59,4 @@ +@@ -51,3 +59,4 @@ mark_as_advanced( OPENJPEG_INCLUDE_DIR ) endif() Modified: branches/2016Q1/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt ============================================================================== --- branches/2016Q1/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt Mon Feb 1 11:36:39 2016 (r407709) +++ branches/2016Q1/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt Mon Feb 1 11:39:02 2016 (r407710) @@ -1,8 +1,8 @@ ---- Utilities/gdcmjpeg/CMakeLists.txt.orig 2012-09-19 15:48:46.000000000 +0200 -+++ Utilities/gdcmjpeg/CMakeLists.txt 2012-09-19 15:49:31.000000000 +0200 -@@ -23,7 +23,7 @@ - ENDIF(NOT DEFINED JPEG_API_VERSION) - SET(JPEG_LIBRARY_PROPERTIES ${JPEG_LIBRARY_PROPERTIES} +--- Utilities/gdcmjpeg/CMakeLists.txt.orig 2015-08-22 14:09:50 UTC ++++ Utilities/gdcmjpeg/CMakeLists.txt +@@ -24,7 +24,7 @@ if(NOT DEFINED JPEG_API_VERSION) + endif() + set(JPEG_LIBRARY_PROPERTIES ${JPEG_LIBRARY_PROPERTIES} VERSION "${GDCM_VERSION}" - SOVERSION "${JPEG_API_VERSION}" + SOVERSION "${GDCM_MAJOR_VERSION}" Modified: branches/2016Q1/devel/gdcm/pkg-plist ============================================================================== --- branches/2016Q1/devel/gdcm/pkg-plist Mon Feb 1 11:36:39 2016 (r407709) +++ branches/2016Q1/devel/gdcm/pkg-plist Mon Feb 1 11:39:02 2016 (r407710) @@ -1,3 +1,5 @@ +%%VTK%%bin/gdcm2pnm +%%VTK%%bin/gdcm2vtk bin/gdcmanon bin/gdcmconv bin/gdcmdiff @@ -10,27 +12,25 @@ bin/gdcmraw bin/gdcmscanner bin/gdcmscu bin/gdcmtar -bin/gdcmxml -%%PORTDOCS%%man/man1/gdcm2pnm.1.gz -%%PORTDOCS%%man/man1/gdcm2vtk.1.gz -%%PORTDOCS%%man/man1/gdcmanon.1.gz -%%PORTDOCS%%man/man1/gdcmconv.1.gz -%%PORTDOCS%%man/man1/gdcmdiff.1.gz -%%PORTDOCS%%man/man1/gdcmdump.1.gz -%%PORTDOCS%%man/man1/gdcmgendir.1.gz -%%PORTDOCS%%man/man1/gdcmimg.1.gz -%%PORTDOCS%%man/man1/gdcminfo.1.gz -%%PORTDOCS%%man/man1/gdcmpap3.1.gz -%%PORTDOCS%%man/man1/gdcmpdf.1.gz -%%PORTDOCS%%man/man1/gdcmraw.1.gz -%%PORTDOCS%%man/man1/gdcmscanner.1.gz -%%PORTDOCS%%man/man1/gdcmscu.1.gz -%%PORTDOCS%%man/man1/gdcmtar.1.gz -%%PORTDOCS%%man/man1/gdcmviewer.1.gz -%%PORTDOCS%%man/man1/gdcmxml.1.gz %%VTK%%bin/gdcmviewer -%%VTK%%bin/gdcm2pnm -%%VTK%%bin/gdcm2vtk +bin/gdcmxml +%%DOXYGEN%%man/man1/gdcm2pnm.1.gz +%%DOXYGEN%%man/man1/gdcm2vtk.1.gz +%%DOXYGEN%%man/man1/gdcmanon.1.gz +%%DOXYGEN%%man/man1/gdcmconv.1.gz +%%DOXYGEN%%man/man1/gdcmdiff.1.gz +%%DOXYGEN%%man/man1/gdcmdump.1.gz +%%DOXYGEN%%man/man1/gdcmgendir.1.gz +%%DOXYGEN%%man/man1/gdcmimg.1.gz +%%DOXYGEN%%man/man1/gdcminfo.1.gz +%%DOXYGEN%%man/man1/gdcmpap3.1.gz +%%DOXYGEN%%man/man1/gdcmpdf.1.gz +%%DOXYGEN%%man/man1/gdcmraw.1.gz +%%DOXYGEN%%man/man1/gdcmscanner.1.gz +%%DOXYGEN%%man/man1/gdcmscu.1.gz +%%DOXYGEN%%man/man1/gdcmtar.1.gz +%%DOXYGEN%%man/man1/gdcmviewer.1.gz +%%DOXYGEN%%man/man1/gdcmxml.1.gz include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmAAbortPDU.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmAAssociateACPDU.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmAAssociateRJPDU.h @@ -49,7 +49,9 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmAudioCodec.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBase64.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBaseCompositeMessage.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBaseNormalizedMessage.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBasePDU.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBaseQuery.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBaseRootQuery.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBasicOffsetTable.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBitmap.h @@ -122,6 +124,7 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFile.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFileAnonymizer.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFileChangeTransferSyntax.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFileDecompressLookupTable.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFileDerivation.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFileExplicitFilter.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFileMetaInformation.h @@ -181,14 +184,24 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmMaximumLengthSub.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmMediaStorage.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmMeshPrimitive.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmModalityPerformedProcedureStepCreateQuery.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmModalityPerformedProcedureStepSetQuery.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmModule.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmModuleEntry.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmModules.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmMovePatientRootQuery.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmMoveStudyRootQuery.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNActionMessages.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNCreateMessages.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNDeleteMessages.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNEventReportMessages.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNGetMessages.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNSetMessages.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNestedModuleEntries.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNetworkEvents.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNetworkStateID.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNormalizedMessageFactory.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNormalizedNetworkFunctions.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmObject.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmOpenSSLCryptoFactory.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmOpenSSLCryptographicMessageSyntax.h @@ -261,6 +274,7 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmStaticAssert.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmStreamImageReader.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmStreamImageWriter.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmStrictScanner.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmString.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmStringFilter.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmStudy.h @@ -323,6 +337,7 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmValueIO.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmValueIO.txx include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmVersion.h +include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmWLMFindQuery.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmWaveform.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmWin32.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmWriter.h @@ -410,13 +425,10 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR %%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/vtkImageYBRToRGB.h %%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/vtkLookupTable16.h %%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/vtkRTStructSetProperties.h -lib/libsocketxx.so.1.2.0 -lib/libsocketxx.so.1.2 -lib/libsocketxx.so lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/GDCMConfig.cmake lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/GDCMConfigVersion.cmake lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/GDCMTargets.cmake -lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/GDCMTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/GDCMTargets-release.cmake lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/UseGDCM.cmake lib/libgdcmCommon.so lib/libgdcmCommon.so.%%GDCM_MAJOR%% @@ -451,6 +463,9 @@ lib/libgdcmjpeg8.so.%%GDCM_MAJOR%%.%%GDC lib/libgdcmuuid.so lib/libgdcmuuid.so.%%GDCM_MAJOR%% lib/libgdcmuuid.so.%%GDCM_MAJOR%%.%%GDCM_MINOR%%.%%GDCM_PATCH%% +lib/libsocketxx.so +lib/libsocketxx.so.1.2 +lib/libsocketxx.so.1.2.0 %%VTK%%lib/libvtkgdcm.so %%VTK%%lib/libvtkgdcm.so.%%GDCM_MAJOR%% %%VTK%%lib/libvtkgdcm.so.%%GDCM_MAJOR%%.%%GDCM_MINOR%%.%%GDCM_PATCH%%