#3547 change gdcm1 to gdcm2

diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake
index bfba0da2e9755ab68e69cd5075749c745d2cfc94..5245aa9cfd09c35e10c802a464e461aff9b62344 100644 (file)
--- 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 02a1466a92c1eb53a01cec7015880a7dabc02c5d..56a4e4b729d1c3e60dd9ac025955a124fc832553 100644 (file)
--- 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 <gdcmReader.h>
        #include <gdcmImageHelper.h>
@@ -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;