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

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

cd836b1bf7097295d23cf8f17997f6bdf686e4fc
diff --cc Linux/scripts/CreaTools-load.sh
index d85a4b4,3595428..bf64e01
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@@ -121,7 -121,27 +121,26 @@@ 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 vtk7itk4
++		 git checkout vtk7itk4wx3
+          cd $generationdir/creatools_source/$bbtksource
 -		 git checkout vtk7itk4
++		 git checkout vtk7itk4wx3
+          cd $generationdir/creatools_source/$creavtksource
 -		 git checkout vtk7itk4
++		 git checkout vtk7itk4wx3
+          cd $generationdir/creatools_source/$creamaracassource
 -		 git checkout vtk7itk4
++		 git checkout vtk7itk4wx3
+          cd $generationdir/creatools_source/$creaimagesource
 -		 git checkout vtk7itk4
++		 git checkout vtk7itk4wx3
+          cd $generationdir/creatools_source/$creacontourssource
 -		 git checkout vtk7itk4
++		 git checkout vtk7itk4wx3
+          cd $generationdir/creatools_source/$crearigidregistrationssource
 -		 git checkout vtk7itk4
++		 git checkout vtk7itk4wx3
+          cd $generationdir/creatools_source/$bbtkgeditorsource
 -		 git checkout vtk7itk4
++		 git checkout vtk7itk4wx3
+          cd $generationdir/creatools_source/$creatoolssource
 -		 git checkout vtk7itk4
 -
++		 git checkout vtk7itk4wx3
        fi
  
        if [ $sourcesFrom = HTML ]
diff --cc Linux/scripts/ThirdParty-install-VTK.sh
index c8b269c,1364d58..efe7f32
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@@ -185,8 -216,9 +227,8 @@@ the
      CMakeCache.txt
    fi
  
-   cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
-   cmake -D CMAKE_CXX_FLAGS:STRING=-std=${stdCompiler} 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 CMAKE_CXX_FLAGS:STRING='-std=c++03' CMakeCache.txt
  
  ##EED 2016-12-22  make -j $corenumber
    make -j $corenumber