From d090b6d7c65e52e01e436a2473dc8ba3f384efbb Mon Sep 17 00:00:00 2001 From: Marco Eichelberg Date: Wed, 25 Aug 2021 15:54:40 +0200 Subject: [PATCH] Made file extensions explicit for CMake CMP0115. Converted the CMake files to explicit source file extensions, as needed for CMake policy CMP0115, introduced with CMake 3.20, which is not set to OLD anymore. Thanks to Github user Kurt Sansom (kayarre) for the pull request. This closes Github pull request #31. --- CMakeLists.txt | 6 - dcmdata/apps/CMakeLists.txt | 7 +- dcmdata/libi2d/CMakeLists.txt | 11 +- dcmdata/libsrc/CMakeLists.txt | 124 ++++++++++++++-- dcmdata/tests/CMakeLists.txt | 30 +++- dcmect/libsrc/CMakeLists.txt | 4 +- dcmect/tests/CMakeLists.txt | 7 +- dcmfg/libsrc/CMakeLists.txt | 72 +++++----- dcmfg/tests/CMakeLists.txt | 23 +-- dcmimage/apps/CMakeLists.txt | 2 +- dcmimage/libsrc/CMakeLists.txt | 25 +++- dcmimgle/apps/CMakeLists.txt | 2 +- dcmimgle/libsrc/CMakeLists.txt | 29 +++- dcmiod/libsrc/CMakeLists.txt | 63 +++++---- dcmiod/tests/CMakeLists.txt | 7 +- dcmjpeg/apps/CMakeLists.txt | 2 +- dcmjpeg/libijg12/CMakeLists.txt | 67 ++++++++- dcmjpeg/libijg16/CMakeLists.txt | 67 ++++++++- dcmjpeg/libijg8/CMakeLists.txt | 67 ++++++++- dcmjpeg/libsrc/CMakeLists.txt | 31 +++- dcmjpls/apps/CMakeLists.txt | 2 +- dcmjpls/libcharls/CMakeLists.txt | 6 +- dcmjpls/libsrc/CMakeLists.txt | 10 +- dcmnet/apps/CMakeLists.txt | 2 +- dcmnet/libsrc/CMakeLists.txt | 44 +++++- dcmnet/tests/CMakeLists.txt | 9 +- dcmpmap/libsrc/CMakeLists.txt | 8 +- dcmpstat/apps/CMakeLists.txt | 2 +- dcmpstat/libsrc/CMakeLists.txt | 48 ++++++- dcmpstat/tests/CMakeLists.txt | 2 +- dcmqrdb/apps/CMakeLists.txt | 2 +- dcmqrdb/libsrc/CMakeLists.txt | 14 +- dcmrt/apps/CMakeLists.txt | 2 +- dcmrt/libsrc/CMakeLists.txt | 234 ++++++++++++++++++++++++++++++- dcmrt/tests/CMakeLists.txt | 8 +- dcmseg/libsrc/CMakeLists.txt | 7 +- dcmseg/tests/CMakeLists.txt | 7 +- dcmsign/apps/CMakeLists.txt | 2 +- dcmsign/libsrc/CMakeLists.txt | 25 +++- dcmsr/apps/CMakeLists.txt | 2 +- dcmsr/libcmr/CMakeLists.txt | 42 +++++- dcmsr/libsrc/CMakeLists.txt | 78 ++++++++++- dcmsr/tests/CMakeLists.txt | 14 +- dcmtls/libsrc/CMakeLists.txt | 9 +- dcmtls/tests/CMakeLists.txt | 2 +- dcmtract/libsrc/CMakeLists.txt | 10 +- dcmwlm/apps/CMakeLists.txt | 2 +- dcmwlm/libsrc/CMakeLists.txt | 7 +- dcmwlm/tests/CMakeLists.txt | 2 +- oflog/libsrc/CMakeLists.txt | 58 +++++++- ofstd/libsrc/CMakeLists.txt | 29 +++- ofstd/tests/CMakeLists.txt | 28 +++- 52 files changed, 1211 insertions(+), 152 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0029b9734..89c0e62745 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,12 +15,6 @@ else() endif() cmake_policy(VERSION "${DCMTK_CMAKE_POLICY_VERSION}") -if (POLICY CMP0115) - # suppress warnings about missing filename extensions caused by policy - # CMP0115, introduced with CMake 3.20 - cmake_policy(SET CMP0115 OLD) -endif() - # Declare project project(DCMTK) diff --git a/dcmdata/apps/CMakeLists.txt b/dcmdata/apps/CMakeLists.txt index 3dda69780a..372d23539f 100644 --- a/dcmdata/apps/CMakeLists.txt +++ b/dcmdata/apps/CMakeLists.txt @@ -3,9 +3,12 @@ include_directories(${LIBXML_INCDIR}) # declare executables foreach(PROGRAM dcm2xml dcmconv dcmcrle dcmdrle dcmdump dcmftest dcmgpdir dump2dcm xml2dcm stl2dcm pdf2dcm dcm2pdf img2dcm dcm2json cda2dcm) - DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}) + DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.cc) endforeach() -DCMTK_ADD_EXECUTABLE(dcmodify dcmodify mdfconen mdfdsman) +DCMTK_ADD_EXECUTABLE(dcmodify + dcmodify.cc + mdfconen.cc + mdfdsman.cc) # make sure executables are linked to the corresponding libraries foreach(PROGRAM dcm2xml dcmconv dcmcrle dcmdrle dcmdump dcmgpdir dcmodify dump2dcm xml2dcm stl2dcm pdf2dcm dcm2pdf img2dcm dcm2json cda2dcm) diff --git a/dcmdata/libi2d/CMakeLists.txt b/dcmdata/libi2d/CMakeLists.txt index 49c2fb878d..27bbb1d418 100644 --- a/dcmdata/libi2d/CMakeLists.txt +++ b/dcmdata/libi2d/CMakeLists.txt @@ -2,6 +2,15 @@ include_directories(${LIBXML_INCDIR}) # create library from source files -DCMTK_ADD_LIBRARY(i2d i2d i2dplvlp i2djpgs i2dbmps i2dplsc i2dplnsc i2dplop i2doutpl) +DCMTK_ADD_LIBRARY(i2d + i2d.cc + i2dplvlp.cc + i2djpgs.cc + i2dbmps.cc + i2dplsc.cc + i2dplnsc.cc + i2dplop.cc + i2doutpl.cc +) DCMTK_TARGET_LINK_MODULES(i2d dcmdata) diff --git a/dcmdata/libsrc/CMakeLists.txt b/dcmdata/libsrc/CMakeLists.txt index ebd9c7410d..ace9935bfd 100644 --- a/dcmdata/libsrc/CMakeLists.txt +++ b/dcmdata/libsrc/CMakeLists.txt @@ -4,15 +4,99 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}") include_directories(${LIBXML_INCDIR}) DCMTK_ADD_LIBRARY(dcmdata - cmdlnarg dcbytstr dcchrstr dccodec dcdatset dcdatutl dcddirif dcdicdir dcdicent - dcdict dcdictbi dcdirrec dcelem dcencdoc dcerror dcfilefo dcfilter dchashdi dcistrma - dcistrmb dcistrmf dcistrmz dcitem dcjson dclist dcmatch dcmetinf dcobject dcostrma - dcostrmb dcostrmf dcostrmz dcpath dcpcache dcpixel dcpixseq dcpxitem dcrleccd - dcrlecce dcrlecp dcrledrg dcrleerg dcrlerp dcsequen dcspchrs dcstack dcswap dctag - dctagkey dctypes dcuid dcvr dcvrae dcvras dcvrat dcvrcs dcvrda dcvrds dcvrdt - dcvrfd dcvrfl dcvris dcvrlo dcvrlt dcvrobow dcvrod dcvrof dcvrol dcvrov dcvrpn - dcvrpobw dcvrsh dcvrsl dcvrss dcvrst dcvrsv dcvrtm dcvruc dcvrui dcvrul dcvrulup - dcvrur dcvrus dcvrut dcvruv dcwcache dcxfer vrscan vrscanl dcistrms dcostrms xml2dcm) + cmdlnarg.cc + dcbytstr.cc + dcchrstr.cc + dccodec.cc + dcdatset.cc + dcdatutl.cc + dcddirif.cc + dcdicdir.cc + dcdicent.cc + dcdict.cc + dcdictbi.cc + dcdirrec.cc + dcelem.cc + dcencdoc.cc + dcerror.cc + dcfilefo.cc + dcfilter.cc + dchashdi.cc + dcistrma.cc + dcistrmb.cc + dcistrmf.cc + dcistrms.cc + dcistrmz.cc + dcitem.cc + dcjson.cc + dclist.cc + dcmatch.cc + dcmetinf.cc + dcobject.cc + dcostrma.cc + dcostrmb.cc + dcostrmf.cc + dcostrms.cc + dcostrmz.cc + dcpath.cc + dcpcache.cc + dcpixel.cc + dcpixseq.cc + dcpxitem.cc + dcrleccd.cc + dcrlecce.cc + dcrlecp.cc + dcrledrg.cc + dcrleerg.cc + dcrlerp.cc + dcsequen.cc + dcspchrs.cc + dcstack.cc + dcswap.cc + dctag.cc + dctagkey.cc + dctypes.cc + dcuid.cc + dcvr.cc + dcvrae.cc + dcvras.cc + dcvrat.cc + dcvrcs.cc + dcvrda.cc + dcvrds.cc + dcvrdt.cc + dcvrfd.cc + dcvrfl.cc + dcvris.cc + dcvrlo.cc + dcvrlt.cc + dcvrobow.cc + dcvrod.cc + dcvrof.cc + dcvrol.cc + dcvrov.cc + dcvrpn.cc + dcvrpobw.cc + dcvrsh.cc + dcvrsl.cc + dcvrss.cc + dcvrst.cc + dcvrsv.cc + dcvrtm.cc + dcvruc.cc + dcvrui.cc + dcvrul.cc + dcvrulup.cc + dcvrur.cc + dcvrus.cc + dcvrut.cc + dcvruv.cc + dcwcache.cc + dcxfer.cc + vrscan.cc + vrscanl.c + xml2dcm.cc +) DCMTK_TARGET_LINK_MODULES(dcmdata ofstd oflog) DCMTK_TARGET_LINK_LIBRARIES(dcmdata ${ZLIB_LIBS} ${LIBXML_LIBS}) @@ -24,8 +108,26 @@ set(DICTIONARIES "${DICOMDIC}" "${PRIVATEDIC}") if(BUILD_APPS) # don't use DCMTK_ADD_EXECUTABLE() since we don't want to install the files - add_executable(mkdictbi EXCLUDE_FROM_ALL mkdictbi dctagkey dcdicent dcdict dcvr dchashdi cmdlnarg dctypes) - add_executable(mkdeftag EXCLUDE_FROM_ALL mkdeftag dctagkey dcdicent dcdict dcvr dchashdi cmdlnarg dctypes) + add_executable(mkdictbi EXCLUDE_FROM_ALL + cmdlnarg.cc + dcdicent.cc + dcdict.cc + dchashdi.cc + dctagkey.cc + dctypes.cc + dcvr.cc + mkdictbi.cc + ) + add_executable(mkdeftag EXCLUDE_FROM_ALL + cmdlnarg.cc + dcdicent.cc + dcdict.cc + dchashdi.cc + dctagkey.cc + dctypes.cc + dcvr.cc + mkdeftag.cc + ) # workaround for Visual Studio to disable dll storage specifiers when linking directly into the executable. # this is needed since the built-in dictionary code is created by the tools below and thus those tools # statically link the few required dcmdata source files instead of linking to dcmdata as a whole. diff --git a/dcmdata/tests/CMakeLists.txt b/dcmdata/tests/CMakeLists.txt index e66fe36507..8c0859684b 100644 --- a/dcmdata/tests/CMakeLists.txt +++ b/dcmdata/tests/CMakeLists.txt @@ -1,5 +1,33 @@ # declare executables -DCMTK_ADD_EXECUTABLE(dcmdata_tests tests tpread ti2dbmp tchval tpath tvrdatim telemlen tparser tdict tvrds tvrfd tvrpn tvrui tvrol tvrov tvrsv tvruv tstrval tspchrs tparent tfilter tvrcomp tmatch tnewdcme tgenuid tsequen titem) +DCMTK_ADD_EXECUTABLE(dcmdata_tests + tchval.cc + tdict.cc + telemlen.cc + tests.cc + tfilter.cc + tgenuid.cc + ti2dbmp.cc + titem.cc + tmatch.cc + tnewdcme.cc + tparent.cc + tparser.cc + tpath.cc + tpread.cc + tsequen.cc + tspchrs.cc + tstrval.cc + tvrcomp.cc + tvrdatim.cc + tvrds.cc + tvrfd.cc + tvrol.cc + tvrov.cc + tvrpn.cc + tvrsv.cc + tvrui.cc + tvruv.cc +) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(dcmdata_tests i2d dcmdata oflog ofstd) diff --git a/dcmect/libsrc/CMakeLists.txt b/dcmect/libsrc/CMakeLists.txt index 87c450d532..fb2429dc6b 100644 --- a/dcmect/libsrc/CMakeLists.txt +++ b/dcmect/libsrc/CMakeLists.txt @@ -1,4 +1,6 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmect enhanced_ct types) +DCMTK_ADD_LIBRARY(dcmect + enhanced_ct.cc + types.cc) DCMTK_TARGET_LINK_MODULES(dcmect dcmfg dcmiod dcmdata ofstd oflog) diff --git a/dcmect/tests/CMakeLists.txt b/dcmect/tests/CMakeLists.txt index 01e732de3e..5d66b1145a 100644 --- a/dcmect/tests/CMakeLists.txt +++ b/dcmect/tests/CMakeLists.txt @@ -1,8 +1,9 @@ # declare executables DCMTK_ADD_EXECUTABLE(dcmect_tests - tests - t_huge_concat - t_roundtrip) + tests.cc + t_huge_concat.cc + t_roundtrip.cc +) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(dcmect_tests dcmect dcmfg dcmdata oflog ofstd) diff --git a/dcmfg/libsrc/CMakeLists.txt b/dcmfg/libsrc/CMakeLists.txt index 44f3c37470..1af050e864 100644 --- a/dcmfg/libsrc/CMakeLists.txt +++ b/dcmfg/libsrc/CMakeLists.txt @@ -1,40 +1,40 @@ # create library from source files DCMTK_ADD_LIBRARY(dcmfg - concatenationcreator - concatenationloader - fg - fgbase - fgctacquisitiondetails - fgctacquisitiontype - fgctadditionalxraysource - fgctexposure - fgctgeometry - fgctimageframetype - fgctposition - fgctreconstruction - fgcttabledynamics - fgctxraydetails - fgderimg - fgfact - fgfracon - fgframeanatomy - fgframevoilut - fgpixeltransform - fgimagedatatype - fginterface - fgirradiationeventid - fgpixmsr - fgparametricmapframetype - fgplanor - fgplanorvol - fgplanpo - fgplanposvol - fgrealworldvaluemapping - fgseg - fgtemporalposition - fgusimagedescription - fgtypes - stack - stackinterface) + concatenationcreator.cc + concatenationloader.cc + fg.cc + fgbase.cc + fgctacquisitiondetails.cc + fgctacquisitiontype.cc + fgctadditionalxraysource.cc + fgctexposure.cc + fgctgeometry.cc + fgctimageframetype.cc + fgctposition.cc + fgctreconstruction.cc + fgcttabledynamics.cc + fgctxraydetails.cc + fgderimg.cc + fgfact.cc + fgfracon.cc + fgframeanatomy.cc + fgframevoilut.cc + fgpixeltransform.cc + fgimagedatatype.cc + fginterface.cc + fgirradiationeventid.cc + fgpixmsr.cc + fgparametricmapframetype.cc + fgplanor.cc + fgplanorvol.cc + fgplanpo.cc + fgplanposvol.cc + fgrealworldvaluemapping.cc + fgseg.cc + fgtemporalposition.cc + fgusimagedescription.cc + fgtypes.cc + stack.cc + stackinterface.cc) DCMTK_TARGET_LINK_MODULES(dcmfg dcmiod dcmdata ofstd oflog) diff --git a/dcmfg/tests/CMakeLists.txt b/dcmfg/tests/CMakeLists.txt index 9c56a8cf2e..5e5b2eefb9 100644 --- a/dcmfg/tests/CMakeLists.txt +++ b/dcmfg/tests/CMakeLists.txt @@ -1,16 +1,17 @@ # declare executables DCMTK_ADD_EXECUTABLE(dcmfg_tests - tests - t_concatenation_creator - t_concatenation_loader - t_ct_acquisition_details - t_ct_acquisition_type - t_ct_image_frame_type - t_ct_position - t_ct_table_dynamics - t_deriv_image - t_frame_content - t_irradiation_event_identification) + tests.cc + t_concatenation_creator.cc + t_concatenation_loader.cc + t_ct_acquisition_details.cc + t_ct_acquisition_type.cc + t_ct_image_frame_type.cc + t_ct_position.cc + t_ct_table_dynamics.cc + t_deriv_image.cc + t_frame_content.cc + t_irradiation_event_identification.cc +) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(dcmfg_tests dcmfg dcmdata oflog ofstd) diff --git a/dcmimage/apps/CMakeLists.txt b/dcmimage/apps/CMakeLists.txt index 77b88b777b..94f511e2b7 100644 --- a/dcmimage/apps/CMakeLists.txt +++ b/dcmimage/apps/CMakeLists.txt @@ -1,6 +1,6 @@ # declare executables foreach(PROGRAM dcm2pnm dcmquant dcmscale dcmicmp) - DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}) + DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.cc) endforeach() # make sure executables are linked to the corresponding libraries diff --git a/dcmimage/libsrc/CMakeLists.txt b/dcmimage/libsrc/CMakeLists.txt index b3a57133b7..8f2c76cc94 100644 --- a/dcmimage/libsrc/CMakeLists.txt +++ b/dcmimage/libsrc/CMakeLists.txt @@ -1,5 +1,28 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmimage diargimg dicmyimg dicoimg dicoopx dicopx dihsvimg dilogger dipalimg dipipng dipitiff diqtctab diqtfs diqthash diqthitl diqtpbox diquant diregist dirgbimg diybrimg diyf2img diyp2img dcmicmph) +DCMTK_ADD_LIBRARY(dcmimage + dcmicmph.cc + diargimg.cc + dicmyimg.cc + dicoimg.cc + dicoopx.cc + dicopx.cc + dihsvimg.cc + dilogger.cc + dipalimg.cc + dipipng.cc + dipitiff.cc + diqtctab.cc + diqtfs.cc + diqthash.cc + diqthitl.cc + diqtpbox.cc + diquant.cc + diregist.cc + dirgbimg.cc + diybrimg.cc + diyf2img.cc + diyp2img.cc +) DCMTK_TARGET_LINK_MODULES(dcmimage oflog dcmdata dcmimgle) DCMTK_TARGET_LINK_LIBRARIES(dcmimage ${LIBTIFF_LIBS} ${LIBPNG_LIBS}) diff --git a/dcmimgle/apps/CMakeLists.txt b/dcmimgle/apps/CMakeLists.txt index 6909f5dc45..cf7c16304a 100644 --- a/dcmimgle/apps/CMakeLists.txt +++ b/dcmimgle/apps/CMakeLists.txt @@ -1,6 +1,6 @@ # declare executables foreach(PROGRAM dcmdspfn dcod2lum dconvlum) - DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}) + DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.cc) endforeach() # make sure executables are linked to the corresponding libraries diff --git a/dcmimgle/libsrc/CMakeLists.txt b/dcmimgle/libsrc/CMakeLists.txt index 2d264806b7..8c2b7f21d9 100644 --- a/dcmimgle/libsrc/CMakeLists.txt +++ b/dcmimgle/libsrc/CMakeLists.txt @@ -1,4 +1,31 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmimgle dcmimage dibaslut diciefn dicielut didislut didispfn didocu digsdfn digsdlut diimage diinpx diluptab dimo1img dimo2img dimoimg dimoimg3 dimoimg4 dimoimg5 dimomod dimoopx dimopx diovdat diovlay diovlimg diovpln diutils) +DCMTK_ADD_LIBRARY(dcmimgle + dcmimage.cc + dibaslut.cc + diciefn.cc + dicielut.cc + didislut.cc + didispfn.cc + didocu.cc + digsdfn.cc + digsdlut.cc + diimage.cc + diinpx.cc + diluptab.cc + dimo1img.cc + dimo2img.cc + dimoimg.cc + dimoimg3.cc + dimoimg4.cc + dimoimg5.cc + dimomod.cc + dimoopx.cc + dimopx.cc + diovdat.cc + diovlay.cc + diovlimg.cc + diovpln.cc + diutils.cc +) DCMTK_TARGET_LINK_MODULES(dcmimgle ofstd oflog dcmdata) diff --git a/dcmiod/libsrc/CMakeLists.txt b/dcmiod/libsrc/CMakeLists.txt index 0f6cf42544..02686f543c 100644 --- a/dcmiod/libsrc/CMakeLists.txt +++ b/dcmiod/libsrc/CMakeLists.txt @@ -1,36 +1,37 @@ # create library from source files DCMTK_ADD_LIBRARY(dcmiod - cielabutil - iodcontentitemmacro - iodcommn - iodmacro - iodrules - iodreferences - iodutil - iodtypes - modacquisitioncontext - modbase - modcommoninstanceref - modenhequipment - modenhusimage - modenhusseries - modequipment - modfloatingpointimagepixel - modfor - modgeneralimage - modgeneralseries - modgeneralstudy - modhelp - modimagepixel - modimagepixelbase - modmultiframefg - modmultiframedimension - modpatient - modpatientstudy - modsegmentationseries - modsopcommon - modsynchronization - modusfor) + cielabutil.cc + iodcontentitemmacro.cc + iodcommn.cc + iodmacro.cc + iodrules.cc + iodreferences.cc + iodutil.cc + iodtypes.cc + modacquisitioncontext.cc + modbase.cc + modcommoninstanceref.cc + modenhequipment.cc + modenhusimage.cc + modenhusseries.cc + modequipment.cc + modfloatingpointimagepixel.cc + modfor.cc + modgeneralimage.cc + modgeneralseries.cc + modgeneralstudy.cc + modhelp.cc + modimagepixel.cc + modimagepixelbase.cc + modmultiframefg.cc + modmultiframedimension.cc + modpatient.cc + modpatientstudy.cc + modsegmentationseries.cc + modsopcommon.cc + modsynchronization.cc + modusfor.cc +) DCMTK_TARGET_LINK_MODULES(dcmiod dcmdata ofstd oflog) diff --git a/dcmiod/tests/CMakeLists.txt b/dcmiod/tests/CMakeLists.txt index b81014fae4..5b84ca9dcc 100644 --- a/dcmiod/tests/CMakeLists.txt +++ b/dcmiod/tests/CMakeLists.txt @@ -1,5 +1,10 @@ # declare executables -DCMTK_ADD_EXECUTABLE(dcmiod_tests tests tcielabutil tcodes timagepixel) +DCMTK_ADD_EXECUTABLE(dcmiod_tests + tests.cc + tcielabutil.cc + tcodes.cc + timagepixel.cc +) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(dcmiod_tests dcmiod dcmdata oflog ofstd) diff --git a/dcmjpeg/apps/CMakeLists.txt b/dcmjpeg/apps/CMakeLists.txt index 294a96f8a8..0b6a085532 100644 --- a/dcmjpeg/apps/CMakeLists.txt +++ b/dcmjpeg/apps/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories("${dcmjpeg_SOURCE_DIR}/include" "${ofstd_SOURCE_DIR}/include # declare executables foreach(PROGRAM dcmcjpeg dcmdjpeg dcmj2pnm dcmmkdir) - DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}) + DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.cc) endforeach() # make sure executables are linked to the corresponding libraries diff --git a/dcmjpeg/libijg12/CMakeLists.txt b/dcmjpeg/libijg12/CMakeLists.txt index 6fe1a2b1ed..2a29a5a8f2 100644 --- a/dcmjpeg/libijg12/CMakeLists.txt +++ b/dcmjpeg/libijg12/CMakeLists.txt @@ -1,2 +1,67 @@ # create library from source files -DCMTK_ADD_LIBRARY(ijg12 jaricom jcapimin jcapistd jcarith jccoefct jccolor jcdctmgr jcdiffct jchuff jcinit jclhuff jclossls jclossy jcmainct jcmarker jcmaster jcodec jcomapi jcparam jcphuff jcpred jcprepct jcsample jcscale jcshuff jctrans jdapimin jdapistd jdarith jdatadst jdatasrc jdcoefct jdcolor jddctmgr jddiffct jdhuff jdinput jdlhuff jdlossls jdlossy jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdpred jdsample jdscale jdshuff jdtrans jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jmemmgr jmemnobs jquant1 jquant2 jutils) +DCMTK_ADD_LIBRARY(ijg12 + jaricom.c + jcapimin.c + jcapistd.c + jcarith.c + jccoefct.c + jccolor.c + jcdctmgr.c + jcdiffct.c + jchuff.c + jcinit.c + jclhuff.c + jclossls.c + jclossy.c + jcmainct.c + jcmarker.c + jcmaster.c + jcodec.c + jcomapi.c + jcparam.c + jcphuff.c + jcpred.c + jcprepct.c + jcsample.c + jcscale.c + jcshuff.c + jctrans.c + jdapimin.c + jdapistd.c + jdarith.c + jdatadst.c + jdatasrc.c + jdcoefct.c + jdcolor.c + jddctmgr.c + jddiffct.c + jdhuff.c + jdinput.c + jdlhuff.c + jdlossls.c + jdlossy.c + jdmainct.c + jdmarker.c + jdmaster.c + jdmerge.c + jdphuff.c + jdpostct.c + jdpred.c + jdsample.c + jdscale.c + jdshuff.c + jdtrans.c + jerror.c + jfdctflt.c + jfdctfst.c + jfdctint.c + jidctflt.c + jidctfst.c + jidctint.c + jidctred.c + jmemmgr.c + jmemnobs.c + jquant1.c + jquant2.c + jutils.c +) diff --git a/dcmjpeg/libijg16/CMakeLists.txt b/dcmjpeg/libijg16/CMakeLists.txt index ad532fe6ae..327227b40c 100644 --- a/dcmjpeg/libijg16/CMakeLists.txt +++ b/dcmjpeg/libijg16/CMakeLists.txt @@ -1,2 +1,67 @@ # create library from source files -DCMTK_ADD_LIBRARY(ijg16 jaricom jcapimin jcapistd jcarith jccoefct jccolor jcdctmgr jcdiffct jchuff jcinit jclhuff jclossls jclossy jcmainct jcmarker jcmaster jcodec jcomapi jcparam jcphuff jcpred jcprepct jcsample jcscale jcshuff jctrans jdapimin jdapistd jdarith jdatadst jdatasrc jdcoefct jdcolor jddctmgr jddiffct jdhuff jdinput jdlhuff jdlossls jdlossy jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdpred jdsample jdscale jdshuff jdtrans jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jmemmgr jmemnobs jquant1 jquant2 jutils) +DCMTK_ADD_LIBRARY(ijg16 + jaricom.c + jcapimin.c + jcapistd.c + jcarith.c + jccoefct.c + jccolor.c + jcdctmgr.c + jcdiffct.c + jchuff.c + jcinit.c + jclhuff.c + jclossls.c + jclossy.c + jcmainct.c + jcmarker.c + jcmaster.c + jcodec.c + jcomapi.c + jcparam.c + jcphuff.c + jcpred.c + jcprepct.c + jcsample.c + jcscale.c + jcshuff.c + jctrans.c + jdapimin.c + jdapistd.c + jdarith.c + jdatadst.c + jdatasrc.c + jdcoefct.c + jdcolor.c + jddctmgr.c + jddiffct.c + jdhuff.c + jdinput.c + jdlhuff.c + jdlossls.c + jdlossy.c + jdmainct.c + jdmarker.c + jdmaster.c + jdmerge.c + jdphuff.c + jdpostct.c + jdpred.c + jdsample.c + jdscale.c + jdshuff.c + jdtrans.c + jerror.c + jfdctflt.c + jfdctfst.c + jfdctint.c + jidctflt.c + jidctfst.c + jidctint.c + jidctred.c + jmemmgr.c + jmemnobs.c + jquant1.c + jquant2.c + jutils.c +) diff --git a/dcmjpeg/libijg8/CMakeLists.txt b/dcmjpeg/libijg8/CMakeLists.txt index e3f8f683b2..acf157af18 100644 --- a/dcmjpeg/libijg8/CMakeLists.txt +++ b/dcmjpeg/libijg8/CMakeLists.txt @@ -1,2 +1,67 @@ # create library from source files -DCMTK_ADD_LIBRARY(ijg8 jaricom jcapimin jcapistd jcarith jccoefct jccolor jcdctmgr jcdiffct jchuff jcinit jclhuff jclossls jclossy jcmainct jcmarker jcmaster jcodec jcomapi jcparam jcphuff jcpred jcprepct jcsample jcscale jcshuff jctrans jdapimin jdapistd jdarith jdatadst jdatasrc jdcoefct jdcolor jddctmgr jddiffct jdhuff jdinput jdlhuff jdlossls jdlossy jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdpred jdsample jdscale jdshuff jdtrans jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jmemmgr jmemnobs jquant1 jquant2 jutils) +DCMTK_ADD_LIBRARY(ijg8 + jaricom.c + jcapimin.c + jcapistd.c + jcarith.c + jccoefct.c + jccolor.c + jcdctmgr.c + jcdiffct.c + jchuff.c + jcinit.c + jclhuff.c + jclossls.c + jclossy.c + jcmainct.c + jcmarker.c + jcmaster.c + jcodec.c + jcomapi.c + jcparam.c + jcphuff.c + jcpred.c + jcprepct.c + jcsample.c + jcscale.c + jcshuff.c + jctrans.c + jdapimin.c + jdapistd.c + jdarith.c + jdatadst.c + jdatasrc.c + jdcoefct.c + jdcolor.c + jddctmgr.c + jddiffct.c + jdhuff.c + jdinput.c + jdlhuff.c + jdlossls.c + jdlossy.c + jdmainct.c + jdmarker.c + jdmaster.c + jdmerge.c + jdphuff.c + jdpostct.c + jdpred.c + jdsample.c + jdscale.c + jdshuff.c + jdtrans.c + jerror.c + jfdctflt.c + jfdctfst.c + jfdctint.c + jidctflt.c + jidctfst.c + jidctint.c + jidctred.c + jmemmgr.c + jmemnobs.c + jquant1.c + jquant2.c + jutils.c +) diff --git a/dcmjpeg/libsrc/CMakeLists.txt b/dcmjpeg/libsrc/CMakeLists.txt index a4a8a60b8a..a393efa688 100644 --- a/dcmjpeg/libsrc/CMakeLists.txt +++ b/dcmjpeg/libsrc/CMakeLists.txt @@ -2,6 +2,35 @@ include_directories("${dcmjpeg_SOURCE_DIR}/include" "${ofstd_SOURCE_DIR}/include" "${oflog_SOURCE_DIR}/include" "${dcmdata_SOURCE_DIR}/include" "${dcmimgle_SOURCE_DIR}/include" "${dcmimage_SOURCE_DIR}/include" "${dcmjpeg_SOURCE_DIR}/libijg8" "${dcmjpeg_SOURCE_DIR}/libijg12" "${dcmjpeg_SOURCE_DIR}/libijg16" ${ZLIB_INCDIR}) # create library from source files -DCMTK_ADD_LIBRARY(dcmjpeg ddpiimpl dipijpeg djcodecd djcodece djcparam djdecbas djdecext djdeclol djdecode djdecpro djdecsps djdecsv1 djdijg12 djdijg8 djdijg16 djeijg12 djeijg8 djeijg16 djencbas djencext djenclol djencode djencpro djencsps djencsv1 djrplol djrploss djutils) +DCMTK_ADD_LIBRARY(dcmjpeg + ddpiimpl.cc + dipijpeg.cc + djcodecd.cc + djcodece.cc + djcparam.cc + djdecbas.cc + djdecext.cc + djdeclol.cc + djdecode.cc + djdecpro.cc + djdecsps.cc + djdecsv1.cc + djdijg12.cc + djdijg8.cc + djdijg16.cc + djeijg12.cc + djeijg8.cc + djeijg16.cc + djencbas.cc + djencext.cc + djenclol.cc + djencode.cc + djencpro.cc + djencsps.cc + djencsv1.cc + djrplol.cc + djrploss.cc + djutils.cc +) DCMTK_TARGET_LINK_MODULES(dcmjpeg ofstd oflog dcmdata dcmimgle dcmimage ijg8 ijg12 ijg16) diff --git a/dcmjpls/apps/CMakeLists.txt b/dcmjpls/apps/CMakeLists.txt index 0cb3f53ed1..f559104658 100644 --- a/dcmjpls/apps/CMakeLists.txt +++ b/dcmjpls/apps/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories("${dcmjpls_SOURCE_DIR}/include" "${ofstd_SOURCE_DIR}/include # declare executables foreach(PROGRAM dcmcjpls dcmdjpls dcml2pnm) - DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}) + DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.cc) endforeach() # make sure executables are linked to the corresponding libraries diff --git a/dcmjpls/libcharls/CMakeLists.txt b/dcmjpls/libcharls/CMakeLists.txt index ae0c017287..9a50cee36d 100644 --- a/dcmjpls/libcharls/CMakeLists.txt +++ b/dcmjpls/libcharls/CMakeLists.txt @@ -2,6 +2,10 @@ include_directories("${dcmjpls_SOURCE_DIR}/libcharls" "${ofstd_SOURCE_DIR}/include") # create library from source files -DCMTK_ADD_LIBRARY(dcmtkcharls header intrface jpegls) +DCMTK_ADD_LIBRARY(dcmtkcharls + header.cc + intrface.cc + jpegls.cc +) DCMTK_TARGET_LINK_MODULES(dcmtkcharls ofstd oflog) diff --git a/dcmjpls/libsrc/CMakeLists.txt b/dcmjpls/libsrc/CMakeLists.txt index bd928f8298..efe322c13d 100644 --- a/dcmjpls/libsrc/CMakeLists.txt +++ b/dcmjpls/libsrc/CMakeLists.txt @@ -2,6 +2,14 @@ include_directories("${dcmjpls_SOURCE_DIR}/include" "${ofstd_SOURCE_DIR}/include" "${oflog_SOURCE_DIR}/include" "${dcmdata_SOURCE_DIR}/include" "${dcmimgle_SOURCE_DIR}/include" "${dcmimage_SOURCE_DIR}/include" "${dcmjpls_SOURCE_DIR}/libcharls" ${ZLIB_INCDIR}) # create library from source files -DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece) +DCMTK_ADD_LIBRARY(dcmjpls + djcparam.cc + djdecode.cc + djencode.cc + djrparam.cc + djcodecd.cc + djutils.cc + djcodece.cc +) DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage dcmtkcharls) diff --git a/dcmnet/apps/CMakeLists.txt b/dcmnet/apps/CMakeLists.txt index 6ab669f207..48061ecf1b 100644 --- a/dcmnet/apps/CMakeLists.txt +++ b/dcmnet/apps/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories("${dcmjpls_SOURCE_DIR}/include" "${dcmjpeg_SOURCE_DIR}/inclu # declare executables foreach(PROGRAM dcmrecv dcmsend echoscu findscu getscu movescu storescp storescu termscu) - DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}) + DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.cc) endforeach() # declare installation files diff --git a/dcmnet/libsrc/CMakeLists.txt b/dcmnet/libsrc/CMakeLists.txt index e788ec5c4a..2b97767caa 100644 --- a/dcmnet/libsrc/CMakeLists.txt +++ b/dcmnet/libsrc/CMakeLists.txt @@ -1,5 +1,47 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmnet assoc cond dcasccff dcasccfg dccfenmp dccfpcmp dccfprmp dccfrsmp dccftsmp dccfuidh dcmlayer dcmtrans dcompat dimcancl dimcmd dimdump dimecho dimfind dimget dimmove dimse dimstore diutil dul dulconst dulextra dulfsm dulparse dulpres extneg lst dfindscu dstorscp dstorscu dcuserid scu scp scpthrd scpcfg scppool dwrap) +DCMTK_ADD_LIBRARY(dcmnet + assoc.cc + cond.cc + dcasccff.cc + dcasccfg.cc + dccfenmp.cc + dccfpcmp.cc + dccfprmp.cc + dccfrsmp.cc + dccftsmp.cc + dccfuidh.cc + dcmlayer.cc + dcmtrans.cc + dcompat.cc + dcuserid.cc + dfindscu.cc + dimcancl.cc + dimcmd.cc + dimdump.cc + dimecho.cc + dimfind.cc + dimget.cc + dimmove.cc + dimse.cc + dimstore.cc + diutil.cc + dstorscp.cc + dstorscu.cc + dul.cc + dulconst.cc + dulextra.cc + dulfsm.cc + dulparse.cc + dulpres.cc + dwrap.c + extneg.cc + lst.cc + scp.cc + scpcfg.cc + scppool.cc + scpthrd.cc + scu.cc +) DCMTK_TARGET_LINK_MODULES(dcmnet ofstd oflog dcmdata) DCMTK_TARGET_LINK_LIBRARIES(dcmnet ${WRAP_LIBS}) diff --git a/dcmnet/tests/CMakeLists.txt b/dcmnet/tests/CMakeLists.txt index b8c0ab5a83..54238364f5 100644 --- a/dcmnet/tests/CMakeLists.txt +++ b/dcmnet/tests/CMakeLists.txt @@ -1,5 +1,12 @@ # declare executables -DCMTK_ADD_EXECUTABLE(dcmnet_tests tests tdump tdimse tpool tscuscp tscusession) +DCMTK_ADD_EXECUTABLE(dcmnet_tests + tdimse.cc + tdump.cc + tests.cc + tpool.cc + tscuscp.cc + tscusession.cc +) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(dcmnet_tests dcmnet) diff --git a/dcmpmap/libsrc/CMakeLists.txt b/dcmpmap/libsrc/CMakeLists.txt index 4087463409..f0397107c1 100644 --- a/dcmpmap/libsrc/CMakeLists.txt +++ b/dcmpmap/libsrc/CMakeLists.txt @@ -1,4 +1,10 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmpmap dpmtypes dpmmodparametricmapseries dpmmodparametricmapimage dpmparametricmapbase dpmparametricmapiod) +DCMTK_ADD_LIBRARY(dcmpmap + dpmmodparametricmapimage.cc + dpmmodparametricmapseries.cc + dpmparametricmapbase.cc + dpmparametricmapiod.cc + dpmtypes.cc +) DCMTK_TARGET_LINK_MODULES(dcmpmap dcmfg dcmiod dcmdata ofstd oflog) diff --git a/dcmpstat/apps/CMakeLists.txt b/dcmpstat/apps/CMakeLists.txt index 776e462220..0209208aa5 100644 --- a/dcmpstat/apps/CMakeLists.txt +++ b/dcmpstat/apps/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${dcmtls_SOURCE_DIR}/include ${LIBXML_INCDIR}) # declare executables foreach(PROGRAM dcmmkcrv dcmmklut dcmp2pgm dcmprscp dcmprscu dcmpschk dcmpsmk dcmpsprt dcmpsrcv dcmpssnd) - DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}) + DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.cc) endforeach() # make sure executables are linked to the corresponding libraries diff --git a/dcmpstat/libsrc/CMakeLists.txt b/dcmpstat/libsrc/CMakeLists.txt index de4cf62b6d..57e0287b82 100644 --- a/dcmpstat/libsrc/CMakeLists.txt +++ b/dcmpstat/libsrc/CMakeLists.txt @@ -1,5 +1,51 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmpstat dcmpstat dviface dvpsab dvpsabl dvpsal dvpsall dvpscf dvpscu dvpscul dvpsda dvpsdal dvpsfs dvpsga dvpsgal dvpsgl dvpsgll dvpsgr dvpsgrl dvpshlp dvpsib dvpsibl dvpsmsg dvpsov dvpsovl dvpspl dvpspl2 dvpspll dvpspr dvpsprt dvpsri dvpsril dvpsrs dvpsrsl dvpssp dvpsspl dvpssv dvpssvl dvpstat dvpstx dvpstxl dvpsvl dvpsvll dvpsvw dvpsvwl dvsighdl) +DCMTK_ADD_LIBRARY(dcmpstat + dcmpstat.cc + dviface.cc + dvpsab.cc + dvpsabl.cc + dvpsal.cc + dvpsall.cc + dvpscf.cc + dvpscu.cc + dvpscul.cc + dvpsda.cc + dvpsdal.cc + dvpsfs.cc + dvpsga.cc + dvpsgal.cc + dvpsgl.cc + dvpsgll.cc + dvpsgr.cc + dvpsgrl.cc + dvpshlp.cc + dvpsib.cc + dvpsibl.cc + dvpsmsg.cc + dvpsov.cc + dvpsovl.cc + dvpspl.cc + dvpspl2.cc + dvpspll.cc + dvpspr.cc + dvpsprt.cc + dvpsri.cc + dvpsril.cc + dvpsrs.cc + dvpsrsl.cc + dvpssp.cc + dvpsspl.cc + dvpssv.cc + dvpssvl.cc + dvpstat.cc + dvpstx.cc + dvpstxl.cc + dvpsvl.cc + dvpsvll.cc + dvpsvw.cc + dvpsvwl.cc + dvsighdl.cc +) DCMTK_TARGET_LINK_MODULES(dcmpstat ofstd oflog dcmdata dcmimgle dcmimage dcmnet dcmdsig dcmtls dcmsr dcmqrdb) set_property(TARGET dcmpstat PROPERTY OUTPUT_NAME "dcmpstat${DCMTK_TLS_LIBRARY_POSTFIX}") diff --git a/dcmpstat/tests/CMakeLists.txt b/dcmpstat/tests/CMakeLists.txt index f3fae247e8..b5ce1da980 100644 --- a/dcmpstat/tests/CMakeLists.txt +++ b/dcmpstat/tests/CMakeLists.txt @@ -1,5 +1,5 @@ # declare executables -DCMTK_ADD_EXECUTABLE(msgserv msgserv) +DCMTK_ADD_EXECUTABLE(msgserv msgserv.cc) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(msgserv dcmpstat dcmdsig dcmsr dcmimage dcmimgle dcmqrdb dcmnet dcmtls dcmdata oflog ofstd) diff --git a/dcmqrdb/apps/CMakeLists.txt b/dcmqrdb/apps/CMakeLists.txt index 7dc4b3c452..7f4938ac0e 100644 --- a/dcmqrdb/apps/CMakeLists.txt +++ b/dcmqrdb/apps/CMakeLists.txt @@ -1,6 +1,6 @@ # declare executables foreach(PROGRAM dcmqrscp dcmqridx dcmqrti) - DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}) + DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.cc) endforeach() # make sure executables are linked to the corresponding libraries diff --git a/dcmqrdb/libsrc/CMakeLists.txt b/dcmqrdb/libsrc/CMakeLists.txt index 95ce478926..832fa9fc4a 100644 --- a/dcmqrdb/libsrc/CMakeLists.txt +++ b/dcmqrdb/libsrc/CMakeLists.txt @@ -1,4 +1,16 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmqrdb dcmqrcbf dcmqrcbg dcmqrcbm dcmqrcbs dcmqrcnf dcmqrdbi dcmqrdbs dcmqropt dcmqrptb dcmqrsrv dcmqrtis) +DCMTK_ADD_LIBRARY(dcmqrdb + dcmqrcbf.cc + dcmqrcbg.cc + dcmqrcbm.cc + dcmqrcbs.cc + dcmqrcnf.cc + dcmqrdbi.cc + dcmqrdbs.cc + dcmqropt.cc + dcmqrptb.cc + dcmqrsrv.cc + dcmqrtis.cc +) DCMTK_TARGET_LINK_MODULES(dcmqrdb ofstd dcmdata dcmnet) diff --git a/dcmrt/apps/CMakeLists.txt b/dcmrt/apps/CMakeLists.txt index e3f97a94c6..ad990ea0bb 100644 --- a/dcmrt/apps/CMakeLists.txt +++ b/dcmrt/apps/CMakeLists.txt @@ -1,5 +1,5 @@ # declare executables -DCMTK_ADD_EXECUTABLE(drtdump drtdump) +DCMTK_ADD_EXECUTABLE(drtdump drtdump.cc) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(drtdump dcmrt dcmdata oflog ofstd) diff --git a/dcmrt/libsrc/CMakeLists.txt b/dcmrt/libsrc/CMakeLists.txt index b1147766b5..104b3c799f 100644 --- a/dcmrt/libsrc/CMakeLists.txt +++ b/dcmrt/libsrc/CMakeLists.txt @@ -1,4 +1,236 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmrt drtdose drtimage drtplan drtstrct drttreat drtionpl drtiontr drmdose drmimage drmplan drmstrct drttypes drtaadcs drtadcs drtads drtafs drtags drtajcs drtas1 drtas5 drtas6 drtas7 drtass drtbads drtbas drtbcps drtbl2 drtbl5 drtbldls drtbldps drtblds1 drtblds5 drtblds6 drtbldts drtbrcss drtbrdrs drtbrs drtbs drtbss drtbvcps drtcbars drtccs drtcctus drtcdrs drtces drtcgis drtchs drtcims drtcis drtcncs drtcos drtcpas drtcpis drtcps drtcsas drtcs drtcshs drtcsis drtcsrs drtcss drtdcs drtdddps drtddps drtdias drtdimcs drtdimrs drtdirs drtdrs drtds drtdspcs drtdss drtdvhs drtdvrrs drteas drtecs drtes drtfds drtfes drtfgs drtfgss drtfms drtfsss drtgas drtgmcs drtgms drtgpis drthsdrs drtiais drtians drtiblds drtibls drtibs drticpds drticps drtics drtiis drtipiqs drtircs drtiseis drtitts drtiwps drtiws drtlsds6 drtlsds7 drtlsds drtmacds drtmas drtmdrs drtmls drtmps drtmris drtmss drtmucs drtoas drtois drtopis drtos drtpbcs drtpcs drtpcxs drtpdecs drtpdeds drtpfms drtpics drtporcs drtporis drtppcs drtprsis drtpscs drtpsics drtpss drtpsss drtpvis drtqds drtras drtrbas2 drtrbas8 drtrbls drtrbos1 drtrbos6 drtrbos7 drtrbs2 drtrbs4 drtrbs8 drtrcdrs drtrcos drtrcps drtrcs drtrdros drtrdrs1 drtrdrs6 drtrdrs8 drtrds drtrecs drtrfgs drtrfors drtrics drtrims drtris drtrlsds drtrmdrs drtrms drtrmss6 drtrmss7 drtrpcs drtrpis drtrppcs drtrpphs drtrpps drtrppss drtrps drtrris1 drtrris6 drtrris9 drtrrms drtrros drtrrpcs drtrrros drtrrs drtrrshs drtrrtps3 drtrrtps4 drtrrtps5 drtrrtps drtrscs drtrsers drtrses drtrshs6 drtrshs7 drtrshs drtrsis drtrsns drtrsos drtrsrs drtrss drtrsss drtrsts drtrtrs2 drtrtrs4 drtrvis drtwrsrs drtrws drtrwvms drtscris drtscs drtsdcs drtsds drtshds drtsins drtsis drtsns drtspccs drtspcs drtspgis drtsptcs drtss drtssrcs drtssrs drtsss drttms0 drttms9 drttscds drttsibs drttsmds drttts drtudis drtvls drtwps drtwrs drtws drtxrs) +DCMTK_ADD_LIBRARY(dcmrt + drmdose.cc + drmimage.cc + drmplan.cc + drmstrct.cc + drtaadcs.cc + drtadcs.cc + drtads.cc + drtafs.cc + drtags.cc + drtajcs.cc + drtas1.cc + drtas5.cc + drtas6.cc + drtas7.cc + drtass.cc + drtbads.cc + drtbas.cc + drtbcps.cc + drtbl2.cc + drtbl5.cc + drtbldls.cc + drtbldps.cc + drtblds1.cc + drtblds5.cc + drtblds6.cc + drtbldts.cc + drtbrcss.cc + drtbrdrs.cc + drtbrs.cc + drtbs.cc + drtbss.cc + drtbvcps.cc + drtcbars.cc + drtccs.cc + drtcctus.cc + drtcdrs.cc + drtces.cc + drtcgis.cc + drtchs.cc + drtcims.cc + drtcis.cc + drtcncs.cc + drtcos.cc + drtcpas.cc + drtcpis.cc + drtcps.cc + drtcs.cc + drtcsas.cc + drtcshs.cc + drtcsis.cc + drtcsrs.cc + drtcss.cc + drtdcs.cc + drtdddps.cc + drtddps.cc + drtdias.cc + drtdimcs.cc + drtdimrs.cc + drtdirs.cc + drtdose.cc + drtdrs.cc + drtds.cc + drtdspcs.cc + drtdss.cc + drtdvhs.cc + drtdvrrs.cc + drteas.cc + drtecs.cc + drtes.cc + drtfds.cc + drtfes.cc + drtfgs.cc + drtfgss.cc + drtfms.cc + drtfsss.cc + drtgas.cc + drtgmcs.cc + drtgms.cc + drtgpis.cc + drthsdrs.cc + drtiais.cc + drtians.cc + drtiblds.cc + drtibls.cc + drtibs.cc + drticpds.cc + drticps.cc + drtics.cc + drtiis.cc + drtimage.cc + drtionpl.cc + drtiontr.cc + drtipiqs.cc + drtircs.cc + drtiseis.cc + drtitts.cc + drtiwps.cc + drtiws.cc + drtlsds.cc + drtlsds6.cc + drtlsds7.cc + drtmacds.cc + drtmas.cc + drtmdrs.cc + drtmls.cc + drtmps.cc + drtmris.cc + drtmss.cc + drtmucs.cc + drtoas.cc + drtois.cc + drtopis.cc + drtos.cc + drtpbcs.cc + drtpcs.cc + drtpcxs.cc + drtpdecs.cc + drtpdeds.cc + drtpfms.cc + drtpics.cc + drtplan.cc + drtporcs.cc + drtporis.cc + drtppcs.cc + drtprsis.cc + drtpscs.cc + drtpsics.cc + drtpss.cc + drtpsss.cc + drtpvis.cc + drtqds.cc + drtras.cc + drtrbas2.cc + drtrbas8.cc + drtrbls.cc + drtrbos1.cc + drtrbos6.cc + drtrbos7.cc + drtrbs2.cc + drtrbs4.cc + drtrbs8.cc + drtrcdrs.cc + drtrcos.cc + drtrcps.cc + drtrcs.cc + drtrdros.cc + drtrdrs1.cc + drtrdrs6.cc + drtrdrs8.cc + drtrds.cc + drtrecs.cc + drtrfgs.cc + drtrfors.cc + drtrics.cc + drtrims.cc + drtris.cc + drtrlsds.cc + drtrmdrs.cc + drtrms.cc + drtrmss6.cc + drtrmss7.cc + drtrpcs.cc + drtrpis.cc + drtrppcs.cc + drtrpphs.cc + drtrpps.cc + drtrppss.cc + drtrps.cc + drtrris1.cc + drtrris6.cc + drtrris9.cc + drtrrms.cc + drtrros.cc + drtrrpcs.cc + drtrrros.cc + drtrrs.cc + drtrrshs.cc + drtrrtps.cc + drtrrtps3.cc + drtrrtps4.cc + drtrrtps5.cc + drtrscs.cc + drtrsers.cc + drtrses.cc + drtrshs.cc + drtrshs6.cc + drtrshs7.cc + drtrsis.cc + drtrsns.cc + drtrsos.cc + drtrsrs.cc + drtrss.cc + drtrsss.cc + drtrsts.cc + drtrtrs2.cc + drtrtrs4.cc + drtrvis.cc + drtrws.cc + drtrwvms.cc + drtscris.cc + drtscs.cc + drtsdcs.cc + drtsds.cc + drtshds.cc + drtsins.cc + drtsis.cc + drtsns.cc + drtspccs.cc + drtspcs.cc + drtspgis.cc + drtsptcs.cc + drtss.cc + drtssrcs.cc + drtssrs.cc + drtsss.cc + drtstrct.cc + drttms0.cc + drttms9.cc + drttreat.cc + drttscds.cc + drttsibs.cc + drttsmds.cc + drttts.cc + drttypes.cc + drtudis.cc + drtvls.cc + drtwps.cc + drtwrs.cc + drtwrsrs.cc + drtws.cc + drtxrs.cc +) DCMTK_TARGET_LINK_MODULES(dcmrt ofstd oflog dcmdata dcmimgle) diff --git a/dcmrt/tests/CMakeLists.txt b/dcmrt/tests/CMakeLists.txt index 375c7ccf80..4aba331550 100644 --- a/dcmrt/tests/CMakeLists.txt +++ b/dcmrt/tests/CMakeLists.txt @@ -1,6 +1,10 @@ # declare executables -DCMTK_ADD_EXECUTABLE(drttest drttest) -DCMTK_ADD_EXECUTABLE(dcmrt_tests tests tsearch tcontour) +DCMTK_ADD_EXECUTABLE(drttest drttest.cc) +DCMTK_ADD_EXECUTABLE(dcmrt_tests + tests.cc + tsearch.cc + tcontour.cc +) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(drttest dcmrt dcmdata oflog ofstd) diff --git a/dcmseg/libsrc/CMakeLists.txt b/dcmseg/libsrc/CMakeLists.txt index a315d53986..f11bfae3e1 100644 --- a/dcmseg/libsrc/CMakeLists.txt +++ b/dcmseg/libsrc/CMakeLists.txt @@ -1,4 +1,9 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmseg segdoc segment segtypes segutils) +DCMTK_ADD_LIBRARY(dcmseg + segdoc.cc + segment.cc + segtypes.cc + segutils.cc +) DCMTK_TARGET_LINK_MODULES(dcmseg dcmfg dcmiod dcmdata ofstd oflog) diff --git a/dcmseg/tests/CMakeLists.txt b/dcmseg/tests/CMakeLists.txt index 61b8e20a1d..5bcd11d692 100644 --- a/dcmseg/tests/CMakeLists.txt +++ b/dcmseg/tests/CMakeLists.txt @@ -1,5 +1,10 @@ # declare executables -DCMTK_ADD_EXECUTABLE(dcmseg_tests tests tutils troundtrip.cc tconcat_binary) +DCMTK_ADD_EXECUTABLE(dcmseg_tests + tests.cc + tutils.cc + troundtrip.cc + tconcat_binary.cc +) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(dcmseg_tests dcmseg dcmfg dcmiod dcmdata oflog ofstd) diff --git a/dcmsign/apps/CMakeLists.txt b/dcmsign/apps/CMakeLists.txt index 2ac47a80fa..ab0f15c4e6 100644 --- a/dcmsign/apps/CMakeLists.txt +++ b/dcmsign/apps/CMakeLists.txt @@ -1,6 +1,6 @@ # declare directories containing used libraries # declare executables -DCMTK_ADD_EXECUTABLE(dcmsign dcmsign) +DCMTK_ADD_EXECUTABLE(dcmsign dcmsign.cc) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(dcmsign dcmdsig dcmdata oflog ofstd) diff --git a/dcmsign/libsrc/CMakeLists.txt b/dcmsign/libsrc/CMakeLists.txt index e36203ac35..7bb4257de3 100644 --- a/dcmsign/libsrc/CMakeLists.txt +++ b/dcmsign/libsrc/CMakeLists.txt @@ -1,8 +1,25 @@ # create library from source files -DCMTK_ADD_LIBRARY( - dcmdsig dcsighlp dcsignat siautopr sibrsapr sicert sicertvf sicreapr - simaccon sinullpr siprivat sipurpos sipkey simdmac sisprof sisrpr - sisrvpr sitstamp sitypes sitsfs) +DCMTK_ADD_LIBRARY(dcmdsig + dcsighlp.cc + dcsignat.cc + siautopr.cc + sibrsapr.cc + sicert.cc + sicertvf.cc + sicreapr.cc + simaccon.cc + simdmac.cc + sinullpr.cc + sipkey.cc + siprivat.cc + sipurpos.cc + sisprof.cc + sisrpr.cc + sisrvpr.cc + sitsfs.cc + sitstamp.cc + sitypes.cc +) DCMTK_TARGET_LINK_MODULES(dcmdsig ofstd dcmdata) DCMTK_TARGET_LINK_LIBRARIES(dcmdsig ${OPENSSL_LIBS}) diff --git a/dcmsr/apps/CMakeLists.txt b/dcmsr/apps/CMakeLists.txt index c0224bfa51..120e7f115a 100644 --- a/dcmsr/apps/CMakeLists.txt +++ b/dcmsr/apps/CMakeLists.txt @@ -1,6 +1,6 @@ # declare executables foreach(PROGRAM dsr2html dsr2xml dsrdump xml2dsr) - DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}) + DCMTK_ADD_EXECUTABLE(${PROGRAM} ${PROGRAM}.cc) endforeach() # make sure executables are linked to the corresponding libraries diff --git a/dcmsr/libcmr/CMakeLists.txt b/dcmsr/libcmr/CMakeLists.txt index a261f15741..2d474512ab 100644 --- a/dcmsr/libcmr/CMakeLists.txt +++ b/dcmsr/libcmr/CMakeLists.txt @@ -1,4 +1,44 @@ # create library from source files -DCMTK_ADD_LIBRARY(cmr init logger srnumvl tid300 tid1001 tid1204 tid1411 tid1419m tid1500 tid1501 tid15def tid1600 tid4019 cid11 cid29 cid29e cid42 cid100 cid244 cid244e cid247 cid4020 cid4021 cid4031 cid4031e cid5000 cid5001 cid6147 cid7021 cid7181 cid7445 cid7452 cid7453 cid7464 cid7469 cid10013 cid10013e cid10033 cid10033e) +DCMTK_ADD_LIBRARY(cmr + cid100.cc + cid10013.cc + cid10013e.cc + cid10033.cc + cid10033e.cc + cid11.cc + cid244.cc + cid244e.cc + cid247.cc + cid29.cc + cid29e.cc + cid4020.cc + cid4021.cc + cid4031.cc + cid4031e.cc + cid42.cc + cid5000.cc + cid5001.cc + cid6147.cc + cid7021.cc + cid7181.cc + cid7445.cc + cid7452.cc + cid7453.cc + cid7464.cc + cid7469.cc + init.cc + logger.cc + srnumvl.cc + tid1001.cc + tid1204.cc + tid1411.cc + tid1419m.cc + tid1500.cc + tid1501.cc + tid15def.cc + tid1600.cc + tid300.cc + tid4019.cc +) DCMTK_TARGET_LINK_MODULES(cmr dcmsr) diff --git a/dcmsr/libsrc/CMakeLists.txt b/dcmsr/libsrc/CMakeLists.txt index 2139fe3a04..be7825d4ef 100644 --- a/dcmsr/libsrc/CMakeLists.txt +++ b/dcmsr/libsrc/CMakeLists.txt @@ -1,5 +1,81 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmsr dsrcitem dsrcodtn dsrcodvl dsrcomtn dsrcomvl dsrcontn dsrcsidl dsrdattn dsrdncsr dsrdnflt dsrdoc dsrdocst dsrdoctn dsrdoctr dsrdtitn dsrimgfr dsrimgse dsrimgtn dsrimgvl dsritcsr dsrnumtn dsrnumvl dsrpnmtn dsrposcn dsrrefin dsrreftn dsrscogr dsrsc3gr dsrscotn dsrsc3tn dsrscovl dsrsc3vl dsrsoprf dsrstrvl dsrtcodt dsrtcosp dsrtcotn dsrtcoto dsrtcovl dsrtextn dsrtimtn dsrtpltn dsrtree dsrtypes dsruidtn dsrwavch dsrwavtn dsrwavvl dsrxmlc dsrxmld dsriodcc dsrbascc dsrenhcc dsrcomcc dsrkeycc dsrmamcc dsrchecc dsrcolcc dsrprocc dsrxrdcc dsrspecc dsrmaccc dsrimpcc dsrc3dcc dsrrrdcc dsracqcc dsrsaecc dsrprdcc dsrpficc dsrplicc dsrrsdcc dsrctpl dsrrtpl dsrstpl dsrctxgr) +DCMTK_ADD_LIBRARY(dcmsr + dsracqcc.cc + dsrbascc.cc + dsrc3dcc.cc + dsrchecc.cc + dsrcitem.cc + dsrcodtn.cc + dsrcodvl.cc + dsrcolcc.cc + dsrcomcc.cc + dsrcomtn.cc + dsrcomvl.cc + dsrcontn.cc + dsrcsidl.cc + dsrctpl.cc + dsrctxgr.cc + dsrdattn.cc + dsrdncsr.cc + dsrdnflt.cc + dsrdoc.cc + dsrdocst.cc + dsrdoctn.cc + dsrdoctr.cc + dsrdtitn.cc + dsrenhcc.cc + dsrimgfr.cc + dsrimgse.cc + dsrimgtn.cc + dsrimgvl.cc + dsrimpcc.cc + dsriodcc.cc + dsritcsr.cc + dsrkeycc.cc + dsrmaccc.cc + dsrmamcc.cc + dsrnumtn.cc + dsrnumvl.cc + dsrpficc.cc + dsrplicc.cc + dsrpnmtn.cc + dsrposcn.cc + dsrprdcc.cc + dsrprocc.cc + dsrrefin.cc + dsrreftn.cc + dsrrrdcc.cc + dsrrsdcc.cc + dsrrtpl.cc + dsrsaecc.cc + dsrsc3gr.cc + dsrsc3tn.cc + dsrsc3vl.cc + dsrscogr.cc + dsrscotn.cc + dsrscovl.cc + dsrsoprf.cc + dsrspecc.cc + dsrstpl.cc + dsrstrvl.cc + dsrtcodt.cc + dsrtcosp.cc + dsrtcotn.cc + dsrtcoto.cc + dsrtcovl.cc + dsrtextn.cc + dsrtimtn.cc + dsrtpltn.cc + dsrtree.cc + dsrtypes.cc + dsruidtn.cc + dsrwavch.cc + dsrwavtn.cc + dsrwavvl.cc + dsrxmlc.cc + dsrxmld.cc + dsrxrdcc.cc +) DCMTK_TARGET_LINK_MODULES(dcmsr ofstd oflog dcmdata dcmimgle dcmimage) DCMTK_TARGET_LINK_LIBRARIES(dcmsr ${LIBXML_LIBS}) diff --git a/dcmsr/tests/CMakeLists.txt b/dcmsr/tests/CMakeLists.txt index fcbf1f5710..8fc0c8cbc2 100644 --- a/dcmsr/tests/CMakeLists.txt +++ b/dcmsr/tests/CMakeLists.txt @@ -1,6 +1,16 @@ # declare executables -DCMTK_ADD_EXECUTABLE(mkreport mkreport) -DCMTK_ADD_EXECUTABLE(dcmsr_tests tests tsrtree tsrdoctr tsrdoc tsrcodvl tsrnumvl tsrtpl tsrcmr tsrlist) +DCMTK_ADD_EXECUTABLE(mkreport mkreport.cc) +DCMTK_ADD_EXECUTABLE(dcmsr_tests + tests.cc + tsrcmr.cc + tsrcodvl.cc + tsrdoc.cc + tsrdoctr.cc + tsrlist.cc + tsrnumvl.cc + tsrtpl.cc + tsrtree.cc +) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(mkreport dcmsr dcmimage dcmimgle dcmdata oflog ofstd) diff --git a/dcmtls/libsrc/CMakeLists.txt b/dcmtls/libsrc/CMakeLists.txt index 6e3fd6920d..704e1991b2 100644 --- a/dcmtls/libsrc/CMakeLists.txt +++ b/dcmtls/libsrc/CMakeLists.txt @@ -1,5 +1,12 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmtls tlscond tlslayer tlsopt tlstrans tlsscu tlsciphr) +DCMTK_ADD_LIBRARY(dcmtls + tlscond.cc + tlslayer.cc + tlsopt.cc + tlstrans.cc + tlsscu.cc + tlsciphr.cc +) DCMTK_TARGET_LINK_MODULES(dcmtls ofstd dcmdata dcmnet) DCMTK_TARGET_LINK_LIBRARIES(dcmtls ${OPENSSL_LIBS}) diff --git a/dcmtls/tests/CMakeLists.txt b/dcmtls/tests/CMakeLists.txt index 0d8c7d2b29..84c48fc5af 100644 --- a/dcmtls/tests/CMakeLists.txt +++ b/dcmtls/tests/CMakeLists.txt @@ -1,5 +1,5 @@ # declare executables -DCMTK_ADD_EXECUTABLE(dcmtls_tests tests tscuscptls) +DCMTK_ADD_EXECUTABLE(dcmtls_tests tests.cc tscuscptls.cc) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(dcmtls_tests dcmnet dcmtls) diff --git a/dcmtract/libsrc/CMakeLists.txt b/dcmtract/libsrc/CMakeLists.txt index 1b35c3bd46..1b3dabf6b0 100644 --- a/dcmtract/libsrc/CMakeLists.txt +++ b/dcmtract/libsrc/CMakeLists.txt @@ -1,4 +1,12 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmtract trctypes trctrackset trctrack trcmeasurement trcstatistic trcmodtractresults trctractographyresults) +DCMTK_ADD_LIBRARY(dcmtract + trctypes.cc + trctrackset.cc + trctrack.cc + trcmeasurement.cc + trcstatistic.cc + trcmodtractresults.cc + trctractographyresults.cc +) DCMTK_TARGET_LINK_MODULES(dcmtract dcmiod dcmdata ofstd oflog) diff --git a/dcmwlm/apps/CMakeLists.txt b/dcmwlm/apps/CMakeLists.txt index b91efd8900..45f0fdd3f4 100644 --- a/dcmwlm/apps/CMakeLists.txt +++ b/dcmwlm/apps/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories("${dcmtls_SOURCE_DIR}/include") # declare executables -DCMTK_ADD_EXECUTABLE(wlmscpfs wlmscpfs wlcefs) +DCMTK_ADD_EXECUTABLE(wlmscpfs wlmscpfs.cc wlcefs.cc) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(wlmscpfs dcmwlm dcmnet dcmtls dcmdata oflog ofstd) diff --git a/dcmwlm/libsrc/CMakeLists.txt b/dcmwlm/libsrc/CMakeLists.txt index b60d9fd80f..b2bf912a47 100644 --- a/dcmwlm/libsrc/CMakeLists.txt +++ b/dcmwlm/libsrc/CMakeLists.txt @@ -1,4 +1,9 @@ # create library from source files -DCMTK_ADD_LIBRARY(dcmwlm wlds wldsfs wlfsim wlmactmg) +DCMTK_ADD_LIBRARY(dcmwlm + wlds.cc + wldsfs.cc + wlfsim.cc + wlmactmg.cc +) DCMTK_TARGET_LINK_MODULES(dcmwlm ofstd dcmdata dcmnet) diff --git a/dcmwlm/tests/CMakeLists.txt b/dcmwlm/tests/CMakeLists.txt index 27ff6213c7..eb3c416799 100644 --- a/dcmwlm/tests/CMakeLists.txt +++ b/dcmwlm/tests/CMakeLists.txt @@ -1,5 +1,5 @@ # declare executables -DCMTK_ADD_EXECUTABLE(wltest wltest) +DCMTK_ADD_EXECUTABLE(wltest wltest.cc) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(wltest dcmwlm dcmnet dcmtls dcmdata oflog ofstd) diff --git a/oflog/libsrc/CMakeLists.txt b/oflog/libsrc/CMakeLists.txt index af13e5eafa..c7d5e43984 100644 --- a/oflog/libsrc/CMakeLists.txt +++ b/oflog/libsrc/CMakeLists.txt @@ -2,11 +2,63 @@ if(WIN32 AND NOT CYGWIN) # clfs needs extra libraries and thus is ignored here - set(OFLOG_PLATFORM_LIBRARIES winsock windebap winconap) + set(OFLOG_PLATFORM_LIBRARIES winsock.cc windebap.cc winconap.cc) else() - set(OFLOG_PLATFORM_LIBRARIES unixsock) + set(OFLOG_PLATFORM_LIBRARIES unixsock.cc) endif() -DCMTK_ADD_LIBRARY(oflog oflog apndimpl appender config consap factory fileap filter globinit hierarchy hierlock layout logger logimpl logevent loglevel loglog lloguser ndc ntelogap nullap objreg patlay pointer property rootlog sleep socketap sockbuff socket strhelp syncprims syslogap threads timehelp clogger env fileinfo lockfile mdc queue snprintf tls version log4judp logmacro asyncap cygwin32 striconv strcloc strccloc ${OFLOG_PLATFORM_LIBRARIES}) +DCMTK_ADD_LIBRARY(oflog + apndimpl.cc + appender.cc + asyncap.cc + clogger.cc + config.cc + consap.cc + cygwin32.cc + env.cc + factory.cc + fileap.cc + fileinfo.cc + filter.cc + globinit.cc + hierarchy.cc + hierlock.cc + layout.cc + lloguser.cc + lockfile.cc + log4judp.cc + logevent.cc + logger.cc + logimpl.cc + loglevel.cc + loglog.cc + logmacro.cc + mdc.cc + ndc.cc + ntelogap.cc + nullap.cc + objreg.cc + oflog.cc + patlay.cc + pointer.cc + property.cc + queue.cc + rootlog.cc + sleep.cc + snprintf.cc + sockbuff.cc + socket.cc + socketap.cc + strccloc.cc + strcloc.cc + strhelp.cc + striconv.cc + syncprims.cc + syslogap.cc + threads.cc + timehelp.cc + tls.cc + version.cc + ${OFLOG_PLATFORM_LIBRARIES}) DCMTK_TARGET_LINK_MODULES(oflog ofstd) diff --git a/ofstd/libsrc/CMakeLists.txt b/ofstd/libsrc/CMakeLists.txt index 87bee25b82..ce3db53c90 100644 --- a/ofstd/libsrc/CMakeLists.txt +++ b/ofstd/libsrc/CMakeLists.txt @@ -1,4 +1,31 @@ # create library from source files -DCMTK_ADD_LIBRARY(ofstd ofchrenc ofcmdln ofconapp ofcond ofconfig ofconsol ofcrc32 ofdate ofdatime oferror offile offilsys offname oflist ofstd ofstring ofstrutl ofthread oftime oftimer oftempf ofxml ofuuid ofmath ofsockad ofrand) +DCMTK_ADD_LIBRARY(ofstd + ofchrenc.cc + ofcmdln.cc + ofconapp.cc + ofcond.cc + ofconfig.cc + ofconsol.cc + ofcrc32.cc + ofdate.cc + ofdatime.cc + oferror.cc + offile.cc + offilsys.cc + offname.cc + oflist.cc + ofstd.cc + ofstring.cc + ofstrutl.cc + ofthread.cc + oftime.cc + oftimer.cc + oftempf.cc + ofxml.cc + ofuuid.cc + ofmath.cc + ofsockad.cc + ofrand.cc +) DCMTK_TARGET_LINK_LIBRARIES(ofstd config ${CHARSET_CONVERSION_LIBS} ${SOCKET_LIBS} ${THREAD_LIBS} ${WIN32_STD_LIBRARIES}) diff --git a/ofstd/tests/CMakeLists.txt b/ofstd/tests/CMakeLists.txt index 33451826b2..565dd02f57 100644 --- a/ofstd/tests/CMakeLists.txt +++ b/ofstd/tests/CMakeLists.txt @@ -1,5 +1,31 @@ # declare executables -DCMTK_ADD_EXECUTABLE(ofstd_tests tests tatof terror tmap tvec tfilsys tftoa tthread tbase64 tstring tstrutl tlist tstack tofdatim tofstd tmarkup tchrenc txml tuuid toffile tmem toption ttuple tlimits tvariant) +DCMTK_ADD_EXECUTABLE(ofstd_tests + tests.cc + tatof.cc + terror.cc + tmap.cc + tvec.cc + tfilsys.cc + tftoa.cc + tthread.cc + tbase64.cc + tstring.cc + tstrutl.cc + tlist.cc + tstack.cc + tofdatim.cc + tofstd.cc + tmarkup.cc + tchrenc.cc + txml.cc + tuuid.cc + toffile.cc + tmem.cc + toption.cc + ttuple.cc + tlimits.cc + tvariant.cc +) # make sure executables are linked to the corresponding libraries DCMTK_TARGET_LINK_MODULES(ofstd_tests ofstd)