From b3b25fb4aaa5acb7b2904846429d5f719597a694 Mon Sep 17 00:00:00 2001 From: Eduardo Enrique Davila Serrano Date: Thu, 21 May 2026 16:11:44 +0200 Subject: [PATCH] #3547 change gdcm1 to gdcm2 --- kernel/cmake/BBTKConfigurePackage.cmake | 11 ++++++----- .../src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake index bfba0da2..5245aa9c 100644 --- a/kernel/cmake/BBTKConfigurePackage.cmake +++ b/kernel/cmake/BBTKConfigurePackage.cmake @@ -172,8 +172,8 @@ IF(${BBTK_PACKAGE_NAME}_USE_ITK) IF(USE_GDCM2) SET(${BBTK_PACKAGE_NAME}_LIBS ${${BBTK_PACKAGE_NAME}_LIBS} - vtkgdcm gdcmIOD gdcmMSFF gdcmexpat gdcmCommon gdcmMEXD gdcmDSED gdcmDICT - gdcmjpeg8 gdcmjpeg12 gdcmjpeg16 socketxx gdcmopenjpeg gdcmcharls + vtkgdcm-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} gdcmIOD gdcmMSFF gdcmexpat gdcmCommon gdcmMEXD gdcmDSED gdcmDICT + gdcmjpeg8 gdcmjpeg12 gdcmjpeg16 socketxx gdcmopenjp2 gdcmcharls ) ENDIF() ENDIF(WIN32) @@ -214,14 +214,15 @@ IF(${BBTK_PACKAGE_NAME}_USE_GDCM2) IF(WIN32) SET(${BBTK_PACKAGE_NAME}_LIBS ${${BBTK_PACKAGE_NAME}_LIBS} - vtkgdcm gdcmIOD gdcmMSFF gdcmexpat gdcmCommon gdcmMEXD gdcmDSED gdcmDICT - gdcmjpeg8 gdcmjpeg12 gdcmjpeg16 socketxx gdcmopenjpeg gdcmcharls + vtkgdcm-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} gdcmIOD gdcmMSFF gdcmexpat gdcmCommon gdcmMEXD gdcmDSED gdcmDICT + gdcmjpeg8 gdcmjpeg12 gdcmjpeg16 socketxx gdcmopenjp2 gdcmcharls + ${VTK_LIBRARIES} ) ELSE(WIN32) SET(${BBTK_PACKAGE_NAME}_LIBS ${${BBTK_PACKAGE_NAME}_LIBS} ${GDCM_LIBRARY} - vtkgdcm-9.2 + vtkgdcm-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} gdcmIOD gdcmDICT gdcmMSFF diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx index 02a1466a..56a4e4b7 100644 --- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx +++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx @@ -35,6 +35,7 @@ #include "gdcmFileHelper.h" #endif + #if defined USE_GDCM2 #include #include @@ -49,7 +50,6 @@ namespace bbgdcmvtk BBTK_ADD_BLACK_BOX_TO_PACKAGE(gdcmvtk,GetXCoherentInfoGdcmReader) BBTK_BLACK_BOX_IMPLEMENTATION(GetXCoherentInfoGdcmReader,bbtk::AtomicBlackBox); - vtkImageData* GetXCoherentInfoGdcmReader::CreateDefaultImage() { int i; -- 2.54.0