#3376 creaToolsTools Bug New Normal - vtk8itk5wx3-mingw64

diff --git a/Linux/installscript b/Linux/installscript
index b03ad1bdcbee9a9f913b125d24ced53d2470d65f..cac6ea6760b1a861e9846e8eaa67631ce9627d4e 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -254,7 +254,7 @@ fi
 # vtk
 if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
            bigDisplay "INSTALL VTK"
-               source scripts/ThirdParty-install-VTK.sh
+               source scripts/ThirdParty-install-VTK.sh
        cd $scriptDirName
 fi
 

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index 20e42268c62d8aef5bf17cae8df29d87e2ce732c..571b4e475df84ce8fbbe5148fddc4088ab48fb11 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -124,27 +124,27 @@ then
  #      mv $libidosource-ESRF $libidosource             
           
          cd $generationdir/creatools_source/$creasource
-                git checkout vtk8itk4wx3-mingw64
+                git checkout vtk8itk5wx3-mingw64
          cd $generationdir/creatools_source/$bbtksource
-                git checkout vtk8itk4wx3-mingw64
+                git checkout vtk8itk5wx3-mingw64
          cd $generationdir/creatools_source/$creavtksource
-                git checkout vtk8itk4wx3-mingw64
+                git checkout vtk8itk5wx3-mingw64
          cd $generationdir/creatools_source/$creamaracassource
-                git checkout vtk8itk4wx3-mingw64
+                git checkout vtk8itk5wx3-mingw64
          cd $generationdir/creatools_source/$creaimagesource
-                git checkout vtk8itk4wx3-mingw64
+                git checkout vtk8itk5wx3-mingw64
          cd $generationdir/creatools_source/$creacontourssource
-                git checkout vtk8itk4wx3-mingw64
+                git checkout vtk8itk5wx3-mingw64
          cd $generationdir/creatools_source/$crearigidregistrationssource
-                git checkout vtk8itk4wx3-mingw64
+                git checkout vtk8itk5wx3-mingw64
          cd $generationdir/creatools_source/$bbtkgeditorsource
-                git checkout vtk8itk4wx3-mingw64
+                git checkout vtk8itk5wx3-mingw64
          cd $generationdir/creatools_source/$creatoolssource
-                git checkout vtk8itk4wx3-mingw64
-                cd $generationdir/creatools_source/$creabrukersource
-                git checkout vtk8itk4wx3-mingw64
-                cd $generationdir/creatools_source/$creaminitoolssource
-                git checkout vtk8itk4wx3-mingw64
+                git checkout vtk8itk5wx3-mingw64
+       cd $generationdir/creatools_source/$creabrukersource
+                git checkout vtk8itk5wx3-mingw64
+       cd $generationdir/creatools_source/$creaminitoolssource
+                git checkout vtk8itk5wx3-mingw64
       fi
 
       if [ $sourcesFrom = HTML ]

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 66691ef2c1c99647cc98f46bf1e8f8a80e36d5de..c063cbddd3e292705d1bc979cb00bcc489f6e70d 100644 (file)
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -119,24 +119,27 @@ fi
   fi
   cd $sourcesDir
 
- echo "we download new stuff"
-  if [ $ITKVersion = ITK3 ]
-  then
-     # deal with ITK3
-     #EED itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz
-     #EED libname=InsightToolkit-3.20.0
-
-     #EED itkfile=InsightToolkit-3.20.1.tar.gz
-     #EED libname=InsightToolkit-3.20.1
+##  if [ $ITKVersion = ITK3 ]
+##  then
+##     # deal with ITK3
+##     #EED itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz
+##     #EED libname=InsightToolkit-3.20.0
+##
+##     #EED itkfile=InsightToolkit-3.20.1.tar.gz
+##     #EED libname=InsightToolkit-3.20.1
+##
+##     itkfile=InsightToolkit-3.20.1-patchCreatis.tgz
+##     libname=InsightToolkit-3.20.1-patchCreatis
+##
+##  else
+##    # deal with ITK4
+##    itkfile=InsightToolkit-4.13.1.zip
+##    libname=InsightToolkit-4.13.1
+##  fi
 
-     itkfile=InsightToolkit-3.20.1-patchCreatis.tgz
-     libname=InsightToolkit-3.20.1-patchCreatis
+    itkfile=InsightToolkit-5.0.1.zip
+    libname=InsightToolkit-5.0.1
 
-  else
-    # deal with ITK4
-    itkfile=InsightToolkit-4.13.1.zip
-    libname=InsightToolkit-4.13.1
-  fi
 
 ##  if [ $OperatingSystem = "MacOS" ]
 ##    then
@@ -175,22 +178,24 @@ then
   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
-  if [ $ITKVersion = ITK3 ]
-  then
-    cmake -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
-  fi
-
-  if [ $ITKVersion = ITK4 ]
-  then
+##  if [ $ITKVersion = ITK3 ]
+##  then
+##    cmake -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
+##  fi
 
-##EED ITK4.0
-#     cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D ITKGroup_Nonunit:BOOL=ON -D  ITKGroup_IO:BOOL=ON  -D Module_ITK-Deprecated:BOOL=ON -D Module_ITK-Review:BOOL=ON  CMakeCache.txt        
+##  if [ $ITKVersion = ITK4 ]
+##  then
 
-##EED ITK4.12
-# -D ITK_USE_SYSTEM_GDCM=ON
-     cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview:BOOL=ON  CMakeCache.txt        
+## ##EED ITK4.0
+## #     cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D ITKGroup_Nonunit:BOOL=ON -D  ITKGroup_IO:BOOL=ON  -D Module_ITK-Deprecated:BOOL=ON -D Module_ITK-Review:BOOL=ON  CMakeCache.txt        
+##
+## ##EED ITK4.12
+## # -D ITK_USE_SYSTEM_GDCM=ON
+##     cmake -D ITKV3_COMPATIBILITY:BOOL=ON -D Module_ITKReview:BOOL=ON  CMakeCache.txt        
+##
+##  fi
 
-  fi
+  cmake -D Module_ITKReview:BOOL=ON  CMakeCache.txt        
   cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} CMakeCache.txt
 
   #uncomment following line if you want to use the bleeding edge of GDCM2!