#3459 gdcm1_v1.3.0 to gdcm2 v3.3.0

diff --git a/Linux/installscript b/Linux/installscript
index 70923a20445dc8c083870434eadfcf40107db897..6ea9aead2dbb5fd3862af5d44dc5df94879a81ef 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -72,7 +72,7 @@ sourcesFrom=GIT
 loginUserName=$USER
 loginGroupName=`groups | awk '{print $1}'`
 buildType=Release
-gdcmVersion=GDCM1
+gdcmVersion=GDCM2
 ITKVersion=ITK4
 export ETC_BASHRC=`getbashrc`
 TDx=OFF

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 244119c6494e43d6df05528dc679e2bb54255069..6fac7d19ac58f6ef9a25b37f57173ed0c446ec52 100644 (file)
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -177,6 +177,9 @@ then
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
   cmake -D BUILD_SHARED_LIBS:BOOL=ON -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF CMakeCache.txt
+  cmake -D ITK_USE_SYSTEM_GDCM:BOOL=ON CMakeCache.txt
+  cmake -D GDCM_DIR:PATH=$GDCM_DIR CMakeCache.txt
+
 #  if [ $ITKVersion = ITK3 ]
 #  then
 #    cmake -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index 6c4f1da4cc45a33d81fa65572cfcaa5abf2b74fb..0579f2dd168cbebbb1bf1e1079f6e7aa4f0f7a3f 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -135,8 +135,13 @@ fi
 #    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2019_06_17_vtk8.zip
 #      unzip gdcm13_2019_06_17_vtk8.zip
 
-    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2022_07_21_vtk92.zip
-       unzip gdcm13_2022_07_21_vtk92.zip       
+# EED 2026-05-18
+#    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2022_07_21_vtk92.zip
+#      unzip gdcm13_2022_07_21_vtk92.zip       
+
+wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm2-v3.3.0_2026-05-18.zip
+unzip gdcm2-v3.3.0_2026-05-18.zip
+
 
 if [ $buildType = "Debug" ]
 then
@@ -149,25 +154,47 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=gdcm13
+
+# EED 2026-05-18
+#  libname=gdcm13
+#  dirInstall=$binDir/$libname-Bin
+#  export GDCM_DIR=$installPrefixThird/lib/gdcm/
+#  mkdir -p $dirInstall
+#  cd $dirInstall
+#  cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
+#  ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
+#  cmake -D CMAKE_CXX_FLAGS:STRING="$cxxFlags"                                 CMakeCache.txt
+#  cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
+#  cmake -D VTK_DIR:PATH=$VTK_DIR CMakeCache.txt
+#  cmake -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
+#  #EED 2017-03-24
+#  source $PWD/scripts/LocalFunctions.sh
+#  if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
+#  then
+#      cmake -D CMAKE_CXX_FLAGS:STRING=-std=c++98 CMakeCache.txt
+#  fi
+
+  libname=gdcm2-v3.3.0_2026-05-18
   dirInstall=$binDir/$libname-Bin
-  export GDCM_DIR=$installPrefixThird/lib/gdcm/
+#  export GDCM_DIR=$installPrefixThird/lib/gdcm/
   mkdir -p $dirInstall
   cd $dirInstall
-
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   cmake -D CMAKE_CXX_FLAGS:STRING="$cxxFlags"                                 CMakeCache.txt
   cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
+  cmake -D GDCM_USE_VTK:BOOL=ON  -D GDCM_BUILD_SHARED_LIBS:BOOL=ON  -D GDCM_BUILD_TESTING:BOOL=OFF CMakeCache.txt
   cmake -D VTK_DIR:PATH=$VTK_DIR CMakeCache.txt
-  cmake -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
 
-  #EED 2017-03-24
-  source $PWD/scripts/LocalFunctions.sh
-  if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
-  then
-       cmake -D CMAKE_CXX_FLAGS:STRING=-std=c++98 CMakeCache.txt
-  fi
+#  #EED 2017-03-24
+#  source $PWD/scripts/LocalFunctions.sh
+#  if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
+#  then
+#      cmake -D CMAKE_CXX_FLAGS:STRING=-std=c++98 CMakeCache.txt
+#  fi
+
+
+
 
   make -j $corenumber
   make -j $corenumber install