]> Creatis software - creaToolsTools.git/commitdiff
#3133 creaToolsTools Feature New Normal - branch vtk7itk4wx3
authorEduardo DAVILA <davila@localhost.localdomain>
Tue, 3 Oct 2017 10:18:57 +0000 (12:18 +0200)
committerEduardo DAVILA <davila@localhost.localdomain>
Tue, 3 Oct 2017 10:18:57 +0000 (12:18 +0200)
1  2 
Linux/scripts/CreaTools-load.sh
Linux/scripts/ThirdParty-install-VTK.sh
Linux/scripts/ThirdParty-install-gdcm.sh

index d85a4b4589871f2c61f1c32a61dd7d521842a450,35954280f144e278e9ebe3bf7709d77d138dd4ba..bf64e01171cadafab069f68351d859a470732059
@@@ -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 ]
index c8b269ca1b5d0ecbdbc3801d3b6a059457ecce15,1364d587586f4b5e035159af44253554aaacb54f..efe7f32e086929b70d1346afe35186002628b3c4
@@@ -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