#3133 creaToolsTools Feature New Normal - branch vtk7itk4wx3

diff --cc Linux/scripts/CreaTools-load.sh
index bf64e01171cadafab069f68351d859a470732059,ef105295acb2d2df487d03d62a44684f12c3de1d..ab1395163b048cbb8431a3cb13eb665a85fc758e
--- 1/Linux/scripts/CreaTools-load.sh
--- 2/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@@ -121,26 -121,18 +121,28 @@@ the
           bash $scriptDir/gitclone.sh $creaminitoolssource          $generationdir     $sourcesFrom
           bash $scriptDir/gitclone.sh $creatoolstoolssource         $generationdir     $sourcesFrom
   #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF         $generationdir   $cvsUserName
 - #           mv $libidosource-ESRF $libidosource               
 -
 - cd $generationdir/creatools_source/$creasource
 -               git checkout changestoITK3and4
 - cd $generationdir/creatools_source/$bbtksource
 -               git checkout changestoITK3and4
 - cd $generationdir/creatools_source/$creabrukersource
 -               git checkout changestoITK3and4
 - cd $generationdir/creatools_source/$creaimagesource
 -               git checkout changestoITK3and4
 -
 -
 + #         mv $libidosource-ESRF $libidosource                 
 +          
 +         cd $generationdir/creatools_source/$creasource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$bbtksource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$creavtksource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$creamaracassource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$creaimagesource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$creacontourssource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$crearigidregistrationssource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$bbtkgeditorsource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$creatoolssource
 +               git checkout vtk7itk4wx3
++               cd $generationdir/creatools_source/$creabrukersource
++               git checkout vtk7itk4wx3
        fi
  
        if [ $sourcesFrom = HTML ]

diff --cc Linux/scripts/ThirdParty-install-Finalize.sh
index 35479fcc7b23b613fd39fe48c723636f2d44ba9a,a927f29e2a67ebb798863a962237c43c67612271..7a7e683fde008c6b70772fa4580662ee5428a4f8
--- 1/Linux/scripts/ThirdParty-install-Finalize.sh
--- 2/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@@ -44,8 -44,8 +44,8 @@@ echo "=================================
  # /// \TODO move theese ones upper in the process!  JPR
  
  export GDCM_DIR=$installPrefixThird/lib/gdcm/
 -export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
 +export VTK_DIR=$installPrefixThird/lib/cmake/vtk-7.1/
- export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
+ export ITK_DIR=$installPrefixThird/lib
  export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
  
  baseLibraryThirdPartyDir=$installPrefixThird/share/creatools
@@@ -65,14 -65,13 +65,14 @@@ f
  touch     $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  chmod 755 $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  
 -echo installPrefixThird='$1'                                                                  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -echo export PATH='$'PATH:'$'installPrefixThird/bin          >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -echo export VTK_DIR='$'installPrefixThird/lib/vtk-5.10      >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 +echo export MESA_GL_VERSION_OVERRIDE=3.2                              >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 +echo installPrefixThird='$1'                                                                          >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 +echo export PATH='$'PATH:'$'installPrefixThird/bin                            >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 +echo export VTK_DIR='$'installPrefixThird/lib                                 >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
- echo export ITK_DIR='$'installPrefixThird/lib/InsightToolkit  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
+ echo export ITK_DIR='$'installPrefixThird/lib                         >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -echo export GDCM_DIR='$'installPrefixThird/lib/gdcm         >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -echo export WT_DIR='$'installPrefixThird/lib/wt-3.3.4         >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -echo export TTH='$'installPrefixThird/bin/tth               >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 +echo export GDCM_DIR='$'installPrefixThird/lib/gdcm           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 +echo export WT_DIR='$'installPrefixThird/lib/wt-3.3.4                 >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 +echo export TTH='$'installPrefixThird/bin/tth                 >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  
  if [ $OperatingSystem = "MacOS" ]
  then