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

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

c2883719f38960a93181a6eccd0e027a715571d9
diff --cc Linux/scripts/CreaTools-load.sh
index ab13951,0b4e67d..90a9d4c
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@@ -121,28 -121,21 +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	 	 
 - #	       mv $libidosource-ESRF $libidosource	 	 
 -
 -		cd $generationdir/creatools_source/$creasource
 -		git checkout changeWx28to30
 -		cd $generationdir/creatools_source/$bbtksource
 -		git checkout changeWx28to30
 -		cd $generationdir/creatools_source/$creamaracassource
 -		git checkout changeWx28to30
 -		cd $generationdir/creatools_source/$creaimagesource
 -		git checkout changeWx28to30
 -		cd $generationdir/creatools_source/$creacontourssource
 -		git checkout changeWx28to30
 -		cd $generationdir/creatools_source/$bbtkgeditorsource
 -		git checkout changeWx28to30
 -
++ #	 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 7a7e683,8ed6209..5dca330
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@@ -65,11 -65,12 +65,12 @@@ f
  touch     $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  chmod 755 $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  
 -
+ echo export GDK_BACKEND=x11				    	       			>> $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/vtk-5.10        	>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -echo export ITK_DIR='$'installPrefixThird/lib/InsightToolkit	>> $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				>> $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
@@@ -79,12 -80,12 +80,12 @@@ the
     echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'GDCM_DIR   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
     echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'ITK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
     echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'VTK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'WT_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 +   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'WT_DIR    	>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  else
--   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'GDCM_DIR   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
--   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
--   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-    echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR    	>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
++   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'GDCM_DIR   	>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
++   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR    	>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
++   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR    	>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
++   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR    		>> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  fi
  
  cd $PWD/scripts