#3446 vtk8itk5wx3-macos in Linux

diff --git a/Linux/installscript b/Linux/installscript
index 9c899b09035957039931f438dd1f802063b62344..b61cd9f980eea7992f4a7f9959081062f01fecb4 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -60,7 +60,7 @@ buildType=Release
 gdcmVersion=GDCM1
 ITKVersion=ITK3
 export ETC_BASHRC=`getbashrc`
-TDx=ON
+TDx=OFF
 
 
 function usage {

diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index b477600c1e9fd995e4e10b16335b2df3be605d83..7cabb283b52b2b9d16e2004f79157ee33854e25c 100644 (file)
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -151,8 +151,11 @@ fi
 ## 
 ##  fi
 
-  wget https://www.vtk.org/files/release/8.2/VTK-8.2.0.zip
-  unzip VTK-8.2.0.zip
+##  wget https://www.vtk.org/files/release/8.2/VTK-8.2.0.zip
+##  unzip VTK-8.2.0.zip
+
+    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/VTK-8.2.0-Patch.zip
+       unzip VTK-8.2.0-Patch.zip
 
 #if [ $buildType = "Debug" ]
 #then
@@ -204,7 +207,7 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=VTK-8.2.0
+  libname=VTK-8.2.0-Patch
   libnameB=vtk-8.2
   dirInstall=$binDir/$libname-Bin
 ##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
@@ -233,9 +236,10 @@ then
    echo
   fi
 
-  cmake -D VTK_Group_Views:BOOL=ON  -D VTK_Group_Qt:BOOL=ON   CMakeCache.txt
+  cmake -D VTK_Group_Views:BOOL=ON -D VTK_Group_Qt:BOOL=ON   CMakeCache.txt
   cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON CMakeCache.txt
   cmake -D VTK_Group_Views:BOOL=ON -D VTK_Group_Qt:BOOL=OFF CMakeCache.txt  
+  cmake -D CMAKE_INSTALL_LIBDIR:STRING="lib" CMakeCache.txt  
 
   make -j $corenumber
   make -j $corenumber install

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index 52ea4b60b513a43ae20ce9e0993c105783af8a3a..b0ecff749141cbfca83309b68451d3930c8b63ce 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -39,13 +39,13 @@
 fi
 
 source $PWD/scripts/CreaTools-configure.sh
-#EED 2017-03-24
+#EED 2021-11-15
   source $PWD/scripts/LocalFunctions.sh
   if [ `getDistrib` == "CentOS" ] && [ `getKernelVersion` < "2.6.34" ]
   then
        stdCompiler=c++98
   else
-       stdCompiler=c++03
+       stdCompiler=c++11
   fi
 
 
@@ -123,8 +123,8 @@ fi
 ## #   tar -xvzf gdcm13_2018_05_28_vtk8.tar.gz
 ##  fi
 
-    wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/gdcm13_2018_05_28_vtk8.zip
-       unzip gdcm13_2018_05_28_vtk8.zip
+    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
 
 #      mv gdcm13_2018_05_28_vtk8 gdcm
 
@@ -139,7 +139,7 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=gdcm13_2018_05_28_vtk8
+  libname=gdcm13
   dirInstall=$binDir/$libname-Bin
   export GDCM_DIR=$installPrefixThird/lib/gdcm/
   mkdir -p $dirInstall