From: Simon Rit Date: Thu, 6 Jun 2013 13:59:51 +0000 (+0200) Subject: Attempt to clean the gdcm mess. At least one include was missing when using the packa... X-Git-Tag: v1.4.0~218^2 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2f90c84deb4bc7a9ef28b123accd478b6ea20d52;p=clitk.git Attempt to clean the gdcm mess. At least one include was missing when using the package. Note that clitkCommon is linked to ITK and VTK libraries so there is no reason to add ITK_LIBRARIES or VTK_LIBRARIES when linking to clitkCommon. --- diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index c64d06b..95a1023 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -62,19 +62,15 @@ IF(CLITK_MEMORY_INFO) ENDIF(CLITK_MEMORY_INFO) -### Set add libraries if system GDCM +#========================================================= IF (CLITK_USE_SYSTEM_GDCM) FIND_PACKAGE(GDCM REQUIRED) - #DD(GDCM_USE_FILE) - #DD(GDCM_INCLUDE_DIRS) - #DD(GDCM_LIBRARY_DIRS) - #DD(CLITK_GDCM_LIBRARIES) - #FIND_LIBRARY(A gdcmDICT ${GDCM_LIBRARY_DIRS}) - #FIND_LIBRARY(B gdcmMSFF ${GDCM_LIBRARY_DIRS}) - #FIND_LIBRARY(C vtkgdcm ${GDCM_LIBRARY_DIRS}) + include(${GDCM_USE_FILE}) + TARGET_LINK_LIBRARIES(clitkCommon vtkgdcm gdcmDICT gdcmMSFF) ENDIF() +#========================================================= -TARGET_LINK_LIBRARIES(clitkCommon vtkCommon vtkImaging ${ITK_LIBRARIES}) +TARGET_LINK_LIBRARIES(clitkCommon ${VTK_LIBRARIES} ${ITK_LIBRARIES}) ADD_LIBRARY(clitkDicomRTStruct STATIC clitkDicomRT_Contour.cxx @@ -83,11 +79,7 @@ ADD_LIBRARY(clitkDicomRTStruct STATIC clitkDicomRTStruct2ImageFilter.cxx ) -IF (CLITK_USE_SYSTEM_GDCM) - TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid vtkgdcm) -ELSE() - TARGET_LINK_LIBRARIES(clitkDicomRTStruct vtkHybrid) -ENDIF() +TARGET_LINK_LIBRARIES(clitkDicomRTStruct clitkCommon) #ADD_LIBRARY(clitkCommonShared SHARED ${clitkCommon_SRC}) #SET_TARGET_PROPERTIES(clitkCommonShared PROPERTIES COMPILE_FLAGS -fPIC) diff --git a/registration/CMakeLists.txt b/registration/CMakeLists.txt index e54632d..9c8d362 100644 --- a/registration/CMakeLists.txt +++ b/registration/CMakeLists.txt @@ -1,11 +1,4 @@ #========================================================= -IF (CLITK_USE_SYSTEM_GDCM) - FIND_PACKAGE(GDCM REQUIRED) - SET(ITK_LIBRARIES ${ITK_LIBRARIES} gdcmDICT gdcmMSFF) -ENDIF() - -#ADD_LIBRARY(clitkLBGSB STATIC clitkLBGSBOptimizer.cxx) -#========================================================= # Add Libraries used in vv and clitk to avoid recompilation WRAP_GGO(clitkAffineRegistration_GGO_C clitkAffineRegistration.ggo) @@ -20,34 +13,34 @@ ADD_LIBRARY(clitkAffineRegistrationLib IF(CLITK_BUILD_REGISTRATION) ############################## registration algorithms ADD_EXECUTABLE(clitkAffineRegistration clitkAffineRegistration.cxx) - TARGET_LINK_LIBRARIES(clitkAffineRegistration clitkAffineRegistrationLib clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkAffineRegistration clitkAffineRegistrationLib clitkCommon) SET(REGISTRATION_INSTALL clitkAffineRegistration) WRAP_GGO(clitkDemonsDeformableRegistration_GGO_C clitkDemonsDeformableRegistration.ggo) ADD_EXECUTABLE(clitkDemonsDeformableRegistration clitkDemonsDeformableRegistration.cxx ${clitkDemonsDeformableRegistration_GGO_C} clitkDemonsDeformableRegistrationGenericFilter.cxx) - TARGET_LINK_LIBRARIES(clitkDemonsDeformableRegistration ${ITK_LIBRARIES} clitkCommon) + TARGET_LINK_LIBRARIES(clitkDemonsDeformableRegistration clitkCommon) SET(REGISTRATION_INSTALL ${REGISTRATION_INSTALL} clitkDemonsDeformableRegistration) WRAP_GGO(clitkBLUTDIR_GGO_C clitkBLUTDIR.ggo) ADD_EXECUTABLE(clitkBLUTDIR clitkBLUTDIR.cxx clitkBLUTDIRGenericFilter.cxx ${clitkBLUTDIR_GGO_C} clitkLBFGSBOptimizer.cxx ) - TARGET_LINK_LIBRARIES(clitkBLUTDIR clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkBLUTDIR clitkCommon) SET(REGISTRATION_INSTALL ${REGISTRATION_INSTALL} clitkBLUTDIR) ############################## registration-related tools to process points, bsplines, vf and image pyramids WRAP_GGO(clitkCalculateTRE_GGO_C clitkCalculateTRE.ggo) ADD_EXECUTABLE(clitkCalculateTRE clitkCalculateTRE.cxx clitkCalculateTREGenericFilter.cxx ${clitkCalculateTRE_GGO_C}) - TARGET_LINK_LIBRARIES(clitkCalculateTRE clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkCalculateTRE clitkCommon) SET(REGISTRATION_INSTALL ${REGISTRATION_INSTALL} clitkCalculateTRE) WRAP_GGO(clitkMatrixTransformToVF_GGO_C clitkMatrixTransformToVF.ggo) ADD_EXECUTABLE(clitkMatrixTransformToVF clitkMatrixTransformToVF.cxx clitkMatrixTransformToVFGenericFilter.cxx ${clitkMatrixTransformToVF_GGO_C}) - TARGET_LINK_LIBRARIES(clitkMatrixTransformToVF ${ITK_LIBRARIES} clitkCommon) + TARGET_LINK_LIBRARIES(clitkMatrixTransformToVF clitkCommon) SET(REGISTRATION_INSTALL ${REGISTRATION_INSTALL} clitkMatrixTransformToVF) WRAP_GGO(clitkConvertBSplineDeformableTransformToVF_GGO_C clitkConvertBSplineDeformableTransformToVF.ggo) ADD_EXECUTABLE(clitkConvertBSplineDeformableTransformToVF clitkConvertBSplineDeformableTransformToVF.cxx clitkConvertBSplineDeformableTransformToVFGenericFilter.cxx ${clitkConvertBSplineDeformableTransformToVF_GGO_C}) - TARGET_LINK_LIBRARIES(clitkConvertBSplineDeformableTransformToVF clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkConvertBSplineDeformableTransformToVF clitkCommon) SET(REGISTRATION_INSTALL ${REGISTRATION_INSTALL} clitkConvertBSplineDeformableTransformToVF) INSTALL (TARGETS ${REGISTRATION_INSTALL} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) diff --git a/segmentation/CMakeLists.txt b/segmentation/CMakeLists.txt index 8638d10..5c16569 100644 --- a/segmentation/CMakeLists.txt +++ b/segmentation/CMakeLists.txt @@ -1,9 +1,3 @@ -#========================================================= -IF (CLITK_USE_SYSTEM_GDCM) - FIND_PACKAGE(GDCM REQUIRED) - SET(ITK_LIBRARIES ${ITK_LIBRARIES} gdcmDICT gdcmMSFF) -ENDIF() - #========================================================= # Add Libraries used in vv and clitk to avoid recompilation @@ -22,48 +16,48 @@ ADD_LIBRARY(clitkSegmentationGgoLib IF(CLITK_BUILD_SEGMENTATION) WRAP_GGO(clitkConnectedComponentLabeling_GGO_C clitkConnectedComponentLabeling.ggo) ADD_EXECUTABLE(clitkConnectedComponentLabeling clitkConnectedComponentLabeling.cxx ${clitkConnectedComponentLabeling_GGO_C}) - TARGET_LINK_LIBRARIES(clitkConnectedComponentLabeling clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkConnectedComponentLabeling clitkCommon) SET(SEGMENTATION_INSTALL clitkConnectedComponentLabeling) ADD_EXECUTABLE(clitkExtractPatient clitkExtractPatient.cxx ${clitkExtractPatient_GGO_C}) - TARGET_LINK_LIBRARIES(clitkExtractPatient clitkCommon ${ITK_LIBRARIES} clitkSegmentationGgoLib) + TARGET_LINK_LIBRARIES(clitkExtractPatient clitkCommon clitkSegmentationGgoLib) SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkExtractPatient) ADD_EXECUTABLE(clitkExtractLung clitkExtractLung.cxx ${clitkExtractLung_GGO_C}) - TARGET_LINK_LIBRARIES(clitkExtractLung clitkSegmentationGgoLib clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkExtractLung clitkSegmentationGgoLib clitkCommon) SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkExtractLung) WRAP_GGO(clitkExtractBones_GGO_C clitkExtractBones.ggo) ADD_EXECUTABLE(clitkExtractBones clitkExtractBones.cxx ${clitkExtractBones_GGO_C}) - TARGET_LINK_LIBRARIES(clitkExtractBones clitkCommon ${ITK_LIBRARIES} clitkSegmentationGgoLib) + TARGET_LINK_LIBRARIES(clitkExtractBones clitkCommon clitkSegmentationGgoLib) SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkExtractBones) WRAP_GGO(clitkMorphoMath_GGO_C clitkMorphoMath.ggo) ADD_EXECUTABLE(clitkMorphoMath clitkMorphoMath.cxx ${clitkMorphoMath_GGO_C}) - TARGET_LINK_LIBRARIES(clitkMorphoMath clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkMorphoMath clitkCommon) SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkMorphoMath) WRAP_GGO(clitkDecomposeAndReconstruct_GGO_C clitkDecomposeAndReconstruct.ggo) ADD_EXECUTABLE(clitkDecomposeAndReconstruct clitkDecomposeAndReconstruct.cxx clitkDecomposeAndReconstructGenericFilter.cxx ${clitkDecomposeAndReconstruct_GGO_C}) - TARGET_LINK_LIBRARIES(clitkDecomposeAndReconstruct clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkDecomposeAndReconstruct clitkCommon) SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkDecomposeAndReconstruct) WRAP_GGO(clitkMotionMask_GGO_C clitkMotionMask.ggo) ADD_EXECUTABLE(clitkMotionMask clitkMotionMask.cxx clitkMotionMaskGenericFilter.cxx ${clitkMotionMask_GGO_C}) - TARGET_LINK_LIBRARIES(clitkMotionMask clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkMotionMask clitkCommon) SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkMotionMask) WRAP_GGO(clitkRegionGrowing_GGO_C clitkRegionGrowing.ggo) ADD_EXECUTABLE(clitkRegionGrowing clitkRegionGrowing.cxx ${clitkRegionGrowing_GGO_C} ${clitkRelativePosition_GGO_C}) - TARGET_LINK_LIBRARIES(clitkRegionGrowing clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkRegionGrowing clitkCommon) INSTALL (TARGETS ${SEGMENTATION_INSTALL} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) ENDIF(CLITK_BUILD_SEGMENTATION) # ADD_EXECUTABLE(ScalarImageMarkovRandomField1 ScalarImageMarkovRandomField1.cxx) -# TARGET_LINK_LIBRARIES(ScalarImageMarkovRandomField1 clitkCommon ${ITK_LIBRARIES} ITKStatistics) +# TARGET_LINK_LIBRARIES(ScalarImageMarkovRandomField1 clitkCommon ITKStatistics) # ADD_EXECUTABLE(ScalarImageKmeansClassifier ScalarImageKmeansClassifier.cxx) -# TARGET_LINK_LIBRARIES(ScalarImageKmeansClassifier clitkCommon ${ITK_LIBRARIES} ITKStatistics) +# TARGET_LINK_LIBRARIES(ScalarImageKmeansClassifier clitkCommon ITKStatistics) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 3bfe9df..98489ad 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,11 +1,3 @@ - -#========================================================= -IF (CLITK_USE_SYSTEM_GDCM) - FIND_PACKAGE(GDCM REQUIRED) - SET(ITK_LIBRARIES ${ITK_LIBRARIES} gdcmDICT gdcmMSFF) -ENDIF() - - #========================================================= # Add Libraries used in vv and clitk to avoid recompilation WRAP_GGO(clitkCropImage_GGO_C clitkCropImage.ggo) @@ -35,7 +27,7 @@ ADD_LIBRARY(clitkMedianImageFilterLib clitkMedianImageGenericFilter.cxx ${clitkM IF (CLITK_BUILD_TOOLS) WRAP_GGO(clitkDicomInfo_GGO_C clitkDicomInfo.ggo) ADD_EXECUTABLE(clitkDicomInfo clitkDicomInfo.cxx ${clitkDicomInfo_GGO_C}) - TARGET_LINK_LIBRARIES(clitkDicomInfo clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkDicomInfo clitkCommon) # set_target_properties(clitkDicomInfo # PROPERTIES # LINK_INTERFACE_LIBRARIES "" @@ -44,226 +36,226 @@ IF (CLITK_BUILD_TOOLS) WRAP_GGO(clitkDicom2Image_GGO_C clitkDicom2Image.ggo) ADD_EXECUTABLE(clitkDicom2Image clitkDicom2Image.cxx ${clitkDicom2Image_GGO_C}) - TARGET_LINK_LIBRARIES(clitkDicom2Image clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkDicom2Image clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicom2Image) WRAP_GGO(clitkDicomWave2Text_GGO_C clitkDicomWave2Text.ggo) ADD_EXECUTABLE(clitkDicomWave2Text clitkDicomWave2Text.cxx ${clitkDicomWave2Text_GGO_C}) - TARGET_LINK_LIBRARIES(clitkDicomWave2Text clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkDicomWave2Text clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicomWave2Text) WRAP_GGO(clitkImageInfo_GGO_C clitkImageInfo.ggo) ADD_EXECUTABLE(clitkImageInfo clitkImageInfo.cxx ${clitkImageInfo_GGO_C}) - TARGET_LINK_LIBRARIES(clitkImageInfo clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkImageInfo clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImageInfo) ADD_EXECUTABLE(clitkImageConvert clitkImageConvert.cxx) - TARGET_LINK_LIBRARIES(clitkImageConvert clitkImageConvertLib clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkImageConvert clitkImageConvertLib clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImageConvert) ADD_EXECUTABLE(clitkBinarizeImage clitkBinarizeImage.cxx) - TARGET_LINK_LIBRARIES(clitkBinarizeImage clitkBinarizeImageLib clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkBinarizeImage clitkBinarizeImageLib clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkBinarizeImage) WRAP_GGO(clitkVFResample_GGO_C clitkVFResample.ggo) ADD_EXECUTABLE(clitkVFResample clitkVFResample.cxx clitkVFResampleGenericFilter.cxx ${clitkVFResample_GGO_C}) - TARGET_LINK_LIBRARIES(clitkVFResample clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkVFResample clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkVFResample) WRAP_GGO(clitkVFInterpolate_GGO_C clitkVFInterpolate.ggo) ADD_EXECUTABLE(clitkVFInterpolate clitkVFInterpolate.cxx clitkVFInterpolateGenericFilter.cxx ${clitkVFInterpolate_GGO_C}) - TARGET_LINK_LIBRARIES(clitkVFInterpolate clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkVFInterpolate clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkVFInterpolate) WRAP_GGO(clitkImageCreate_GGO_C clitkImageCreate.ggo) ADD_EXECUTABLE(clitkImageCreate clitkImageCreate.cxx ${clitkImageCreate_GGO_C}) - TARGET_LINK_LIBRARIES(clitkImageCreate clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkImageCreate clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImageCreate) WRAP_GGO(clitkZeroVF_GGO_C clitkZeroVF.ggo) ADD_EXECUTABLE(clitkZeroVF clitkZeroVF.cxx ${clitkZeroVF_GGO_C} clitkZeroVFGenericFilter.cxx) - TARGET_LINK_LIBRARIES(clitkZeroVF clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkZeroVF clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkZeroVF) WRAP_GGO(clitkSplitImage_GGO_C clitkSplitImage.ggo) ADD_EXECUTABLE(clitkSplitImage clitkSplitImage.cxx clitkSplitImageGenericFilter.cxx ${clitkSplitImage_GGO_C}) - TARGET_LINK_LIBRARIES(clitkSplitImage clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkSplitImage clitkCommon ) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkSplitImage) WRAP_GGO(clitkWriteDicomSeries_GGO_C clitkWriteDicomSeries.ggo) ADD_EXECUTABLE(clitkWriteDicomSeries clitkWriteDicomSeries.cxx ${clitkWriteDicomSeries_GGO_C}) - TARGET_LINK_LIBRARIES(clitkWriteDicomSeries clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkWriteDicomSeries clitkCommon ) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkWriteDicomSeries) WRAP_GGO(clitkMedianTemporalDimension_GGO_C clitkMedianTemporalDimension.ggo) ADD_EXECUTABLE(clitkMedianTemporalDimension clitkMedianTemporalDimension.cxx ${clitkMedianTemporalDimension_GGO_C}) - TARGET_LINK_LIBRARIES(clitkMedianTemporalDimension clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkMedianTemporalDimension clitkCommon ) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMedianTemporalDimension) WRAP_GGO(clitkWarpImage_GGO_C clitkWarpImage.ggo) ADD_EXECUTABLE(clitkWarpImage clitkWarpImage.cxx ${clitkWarpImage_GGO_C} clitkWarpImageGenericFilter.cxx) - TARGET_LINK_LIBRARIES(clitkWarpImage clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkWarpImage clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkWarpImage) WRAP_GGO(clitkInvertVF_GGO_C clitkInvertVF.ggo) ADD_EXECUTABLE(clitkInvertVF clitkInvertVF.cxx ${clitkInvertVF_GGO_C}) - TARGET_LINK_LIBRARIES(clitkInvertVF clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkInvertVF clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkInvertVF) WRAP_GGO(clitkAffineTransform_GGO_C clitkAffineTransform.ggo) ADD_EXECUTABLE(clitkAffineTransform clitkAffineTransform.cxx ${clitkAffineTransform_GGO_C}) - TARGET_LINK_LIBRARIES(clitkAffineTransform clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkAffineTransform clitkCommon ) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkAffineTransform) WRAP_GGO(clitkSetBackground_GGO_C clitkSetBackground.ggo) ADD_EXECUTABLE(clitkSetBackground clitkSetBackground.cxx clitkSetBackgroundGenericFilter.cxx ${clitkSetBackground_GGO_C}) - TARGET_LINK_LIBRARIES(clitkSetBackground clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkSetBackground clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkSetBackground) WRAP_GGO(clitkGammaIndex_GGO_C clitkGammaIndex.ggo) ADD_EXECUTABLE(clitkGammaIndex clitkGammaIndex.cxx ${clitkGammaIndex_GGO_C}) - TARGET_LINK_LIBRARIES(clitkGammaIndex clitkCommon ${VTK_LIBRARIES} ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkGammaIndex clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkGammaIndex) ADD_EXECUTABLE(clitkImageArithm clitkImageArithm.cxx) - TARGET_LINK_LIBRARIES(clitkImageArithm clitkImageArithmImageLib clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkImageArithm clitkImageArithmImageLib clitkCommon ) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImageArithm) ADD_EXECUTABLE(clitkVectorArithm clitkVectorArithm.cxx) - TARGET_LINK_LIBRARIES(clitkVectorArithm clitkVectorArithmLib clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkVectorArithm clitkVectorArithmLib clitkCommon ) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkVectorArithm) WRAP_GGO(clitkUnsharpMask_GGO_C clitkUnsharpMask.ggo) ADD_EXECUTABLE(clitkUnsharpMask clitkUnsharpMask.cxx ${clitkUnsharpMask_GGO_C}) - TARGET_LINK_LIBRARIES(clitkUnsharpMask clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkUnsharpMask clitkCommon ) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkUnsharpMask) WRAP_GGO(clitkFooImage_GGO_C clitkFooImage.ggo) ADD_EXECUTABLE(clitkFooImage clitkFooImage.cxx ${clitkFooImage_GGO_C}) - TARGET_LINK_LIBRARIES(clitkFooImage clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkFooImage clitkCommon ) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkFooImage) #WRAP_GGO(clitkMedianImageFilter_GGO_C clitkMedianImageFilter.ggo) #ADD_EXECUTABLE(clitkMedianImageFilter clitkMedianImageFilter.cxx ${clitkMedianImageFilter_GGO_C}) - #TARGET_LINK_LIBRARIES(clitkMedianImageFilter clitkMedianImageFilterLib clitkCommon ${ITK_LIBRARIES}) + #TARGET_LINK_LIBRARIES(clitkMedianImageFilter clitkMedianImageFilterLib clitkCommon) #SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMedianImageFilter) ADD_EXECUTABLE(clitkResampleImage clitkResampleImage.cxx) - TARGET_LINK_LIBRARIES(clitkResampleImage clitkResampleImageLib clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkResampleImage clitkResampleImageLib clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkResampleImage) WRAP_GGO(clitkMinMaxMask_GGO_C clitkMinMaxMask.ggo) ADD_EXECUTABLE(clitkMinMaxMask clitkMinMaxMask.cxx ${clitkMinMaxMask_GGO_C}) - TARGET_LINK_LIBRARIES(clitkMinMaxMask clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkMinMaxMask clitkCommon ) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMinMaxMask) WRAP_GGO(clitkAutoCrop_GGO_C clitkAutoCrop.ggo) ADD_EXECUTABLE(clitkAutoCrop clitkAutoCrop.cxx ${clitkAutoCrop_GGO_C}) - TARGET_LINK_LIBRARIES(clitkAutoCrop clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkAutoCrop clitkCommon ) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkAutoCrop) WRAP_GGO(clitkDicomRTStruct2Image_GGO_C clitkDicomRTStruct2Image.ggo) ADD_EXECUTABLE(clitkDicomRTStruct2Image clitkDicomRTStruct2Image.cxx ${clitkDicomRTStruct2Image_GGO_C}) - TARGET_LINK_LIBRARIES(clitkDicomRTStruct2Image clitkDicomRTStruct clitkCommon ${ITK_LIBRARIES} ) + TARGET_LINK_LIBRARIES(clitkDicomRTStruct2Image clitkDicomRTStruct) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicomRTStruct2Image) IF(CLITK_USE_SYSTEM_GDCM) WRAP_GGO(clitkImage2DicomRTStruct_GGO_C clitkImage2DicomRTStruct.ggo) ADD_EXECUTABLE(clitkImage2DicomRTStruct clitkImage2DicomRTStruct.cxx ${clitkImage2DicomRTStruct_GGO_C}) - TARGET_LINK_LIBRARIES(clitkImage2DicomRTStruct clitkDicomRTStruct clitkCommon ${ITK_LIBRARIES} ${CLITK_GDCM_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkImage2DicomRTStruct clitkDicomRTStruct) ENDIF() WRAP_GGO(clitkComposeVF_GGO_C clitkComposeVF.ggo) ADD_EXECUTABLE(clitkComposeVF clitkComposeVFGenericFilter.cxx clitkComposeVF.cxx ${clitkComposeVF_GGO_C}) - TARGET_LINK_LIBRARIES(clitkComposeVF ${ITK_LIBRARIES} clitkCommon) + TARGET_LINK_LIBRARIES(clitkComposeVF clitkCommon ) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkComposeVF) WRAP_GGO(clitkMergeSequence_GGO_C clitkMergeSequence.ggo) ADD_EXECUTABLE(clitkMergeSequence clitkMergeSequence.cxx clitkMergeSequenceGenericFilter.cxx ${clitkMergeSequence_GGO_C}) - TARGET_LINK_LIBRARIES(clitkMergeSequence ${ITK_LIBRARIES} clitkCommon) + TARGET_LINK_LIBRARIES(clitkMergeSequence clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMergeSequence) WRAP_GGO(clitkBackProjectImage_GGO_C clitkBackProjectImage.ggo) ADD_EXECUTABLE(clitkBackProjectImage clitkBackProjectImage.cxx clitkBackProjectImageGenericFilter.cxx ${clitkBackProjectImage_GGO_C}) - TARGET_LINK_LIBRARIES(clitkBackProjectImage clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkBackProjectImage clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkBackProjectImage) ADD_EXECUTABLE(clitkCropImage clitkCropImage.cxx ${clitkCropImage_GGO_C}) - TARGET_LINK_LIBRARIES(clitkCropImage clitkCropImageLib clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkCropImage clitkCropImageLib clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkCropImage) # WRAP_GGO(clitkExtractSlice_GGO_C clitkExtractSlice.ggo) # ADD_EXECUTABLE(clitkExtractSlice clitkExtractSlice.cxx clitkExtractSliceGenericFilter.cxx ${clitkExtractSlice_GGO_C}) - # TARGET_LINK_LIBRARIES(clitkExtractSlice clitkCommon ${ITK_LIBRARIES}) + # TARGET_LINK_LIBRARIES(clitkExtractSlice clitkCommon) #SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkExtractSlice) WRAP_GGO(clitkFlipImage_GGO_C clitkFlipImage.ggo) ADD_EXECUTABLE(clitkFlipImage clitkFlipImage.cxx clitkFlipImageGenericFilter.cxx ${clitkFlipImage_GGO_C}) - TARGET_LINK_LIBRARIES(clitkFlipImage clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkFlipImage clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkFlipImage) WRAP_GGO(clitkMirrorPadImage_GGO_C clitkMirrorPadImage.ggo) ADD_EXECUTABLE(clitkMirrorPadImage clitkMirrorPadImage.cxx clitkMirrorPadImageGenericFilter.cxx ${clitkMirrorPadImage_GGO_C}) - TARGET_LINK_LIBRARIES(clitkMirrorPadImage clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkMirrorPadImage clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMirrorPadImage) WRAP_GGO(clitkImageMoment_GGO_C clitkImageMoment.ggo) ADD_EXECUTABLE(clitkImageMoment clitkImageMoment.cxx clitkImageMomentGenericFilter.cxx ${clitkImageMoment_GGO_C}) - TARGET_LINK_LIBRARIES(clitkImageMoment clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkImageMoment clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImageMoment) WRAP_GGO(clitkImageStatistics_GGO_C clitkImageStatistics.ggo) ADD_EXECUTABLE(clitkImageStatistics clitkImageStatistics.cxx clitkImageStatisticsGenericFilter.cxx ${clitkImageStatistics_GGO_C}) - TARGET_LINK_LIBRARIES(clitkImageStatistics clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkImageStatistics clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImageStatistics) WRAP_GGO(clitkVFConvert_GGO_C clitkVFConvert.ggo) ADD_EXECUTABLE(clitkVFConvert clitkVFConvert.cxx clitkVFConvertGenericFilter.cxx ${clitkVFConvert_GGO_C}) - TARGET_LINK_LIBRARIES(clitkVFConvert ${ITK_LIBRARIES} clitkCommon ) + TARGET_LINK_LIBRARIES(clitkVFConvert clitkCommon ) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkVFConvert) WRAP_GGO(clitkImageToVectorImage_GGO_C clitkImageToVectorImage.ggo) ADD_EXECUTABLE(clitkImageToVectorImage clitkImageToVectorImage.cxx clitkImageToVectorImageGenericFilter.cxx ${clitkImageToVectorImage_GGO_C}) - TARGET_LINK_LIBRARIES(clitkImageToVectorImage clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkImageToVectorImage clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImageToVectorImage) WRAP_GGO(clitkVectorImageToImage_GGO_C clitkVectorImageToImage.ggo) ADD_EXECUTABLE(clitkVectorImageToImage clitkVectorImageToImage.cxx clitkVectorImageToImageGenericFilter.cxx ${clitkVectorImageToImage_GGO_C}) - TARGET_LINK_LIBRARIES(clitkVectorImageToImage clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkVectorImageToImage clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkVectorImageToImage) ADD_EXECUTABLE(clitkMIP clitkMIP.cxx clitkMIPGenericFilter.cxx) - TARGET_LINK_LIBRARIES(clitkMIP clitkMIPLib clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkMIP clitkMIPLib clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMIP) WRAP_GGO(clitkTransformLandmarks_GGO_C clitkTransformLandmarks.ggo) ADD_EXECUTABLE(clitkTransformLandmarks clitkTransformLandmarks.cxx ${clitkTransformLandmarks_GGO_C}) - TARGET_LINK_LIBRARIES(clitkTransformLandmarks clitkCommon ${ITK_LIBRARIES} ${VTK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkTransformLandmarks clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkTransformLandmarks) WRAP_GGO(clitkMaskLandmarks_GGO_C clitkMaskLandmarks.ggo) ADD_EXECUTABLE(clitkMaskLandmarks clitkMaskLandmarks.cxx ${clitkMaskLandmarks_GGO_C}) - TARGET_LINK_LIBRARIES(clitkMaskLandmarks clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkMaskLandmarks clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMaskLandmarks) ADD_EXECUTABLE(clitkMakeSphereImage clitkMakeSphereImage.cxx) # clitkLineProfileGenericFilter.cxx ${clitkLineProfile_GGO_C}) - TARGET_LINK_LIBRARIES(clitkMakeSphereImage clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkMakeSphereImage clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMakeSphereImage) WRAP_GGO(clitkJacobianImage_GGO_C clitkJacobianImage.ggo) ADD_EXECUTABLE(clitkJacobianImage clitkJacobianImage.cxx clitkJacobianImageGenericFilter.cxx ${clitkJacobianImage_GGO_C}) - TARGET_LINK_LIBRARIES(clitkJacobianImage clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkJacobianImage clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkJacobianImage) WRAP_GGO(clitkPadImage_GGO_C clitkPadImage.ggo) ADD_EXECUTABLE(clitkPadImage clitkPadImage.cxx clitkPadImageGenericFilter.cxx ${clitkPadImage_GGO_C}) - TARGET_LINK_LIBRARIES(clitkPadImage clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkPadImage clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkPadImage) WRAP_GGO(clitkCatImage_GGO_C clitkCatImage.ggo) ADD_EXECUTABLE(clitkCatImage clitkCatImage.cxx ${clitkCatImage_GGO_C}) - TARGET_LINK_LIBRARIES(clitkCatImage clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkCatImage clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkCatImage) IF(CLITK_EXPERIMENTAL) @@ -274,7 +266,7 @@ IF (CLITK_BUILD_TOOLS) WRAP_GGO(clitkMeshToBinaryImage_GGO_C clitkMeshToBinaryImage.ggo) ADD_EXECUTABLE(clitkMeshToBinaryImage clitkMeshToBinaryImage.cxx ${clitkMeshToBinaryImage_GGO_C}) - TARGET_LINK_LIBRARIES(clitkMeshToBinaryImage clitkCommon ${ITK_LIBRARIES} ${VTK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkMeshToBinaryImage clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMeshToBinaryImage) WRAP_GGO(clitkMeshViewer_GGO_C clitkMeshViewer.ggo) @@ -288,7 +280,7 @@ IF (CLITK_BUILD_TOOLS) ELSE(ITK_VERSION_MAJOR VERSION_LESS 4) WRAP_GGO(clitkDicomRTPlan2Gate_GGO_C clitkDicomRTPlan2Gate.ggo) ADD_EXECUTABLE(clitkDicomRTPlan2Gate clitkDicomRTPlan2Gate.cxx clitkDicomRTPlan2Gate_ggo.c) - TARGET_LINK_LIBRARIES(clitkDicomRTPlan2Gate clitkCommon ${ITK_LIBRARIES}) + TARGET_LINK_LIBRARIES(clitkDicomRTPlan2Gate clitkCommon) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicomRTPlan2Gate) ENDIF(ITK_VERSION_MAJOR VERSION_LESS 4) diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index f9bfa7a..9895570 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -7,14 +7,6 @@ if(COMMAND cmake_policy) endif(COMMAND cmake_policy) #========================================================= -#========================================================= -IF (CLITK_USE_SYSTEM_GDCM) - FIND_PACKAGE(GDCM REQUIRED) - SET(ITK_LIBRARIES ${ITK_LIBRARIES} gdcmDICT gdcmMSFF) -ENDIF() -#========================================================= - - #========================================================= #List of vv tools to compile SET(vv_TOOLS @@ -240,7 +232,6 @@ ELSE(WIN32) ENDIF(WIN32) TARGET_LINK_LIBRARIES(vv vvLib) -#${CLITK_GDCM_LIBRARIES}) #========================================================= # Install options (also used by CPack)