From: Eduardo DAVILA <davila@localhost.localdomain>
Date: Tue, 3 Oct 2017 10:28:14 +0000 (+0200)
Subject: #3133 creaToolsTools Feature New Normal  -  branch vtk7itk4wx3
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=252de84e4c1e08e51fd8b00f7b7c4967211b461f;p=creaToolsTools.git

#3133 creaToolsTools Feature New Normal  -  branch vtk7itk4wx3
---

252de84e4c1e08e51fd8b00f7b7c4967211b461f
diff --cc Linux/scripts/CreaTools-load.sh
index bf64e01,ef10529..ab13951
--- a/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 35479fc,a927f29..7a7e683
--- a/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