X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Linux%2Fscripts%2FThirdParty-install-VTK.sh;h=36ac0308439e775faf0b6e9c390c18bc2d0857e7;hb=c7cbdaae00e1c26ca7b0a862a6198b204bcb797d;hp=5d2bf7e7416dcbc114dfe1352bb25d4ec06862a3;hpb=9823920ffaede415c7e5ea4bfb8e9d77916620ef;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index 5d2bf7e..36ac030 100644
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+
+ echo  "in ThirdParty-install-VTK.sh, source " $PWD/scripts/CreaTools-configure.sh
  if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
  then 
    echo
@@ -13,6 +15,30 @@
    exit 0
 fi
 
+source $PWD/scripts/CreaTools-configure.sh
+
+   echo "------"
+   echo $PWD/scripts/CreaTools-configure.sh
+   echo --generationdir--
+   echo $generationdir
+   echo --docgeneration--
+   echo $docgeneration
+   echo --installPrefix--
+   echo $installPrefix
+   echo --installPrefixThird--
+   echo $installPrefixThird
+   echo --buildType--
+   echo $buildType
+   echo --gdcmVersion--
+   echo $gdcmVersion
+#   echo --sourcesFrom--
+#   echo $sourcesFrom
+#   echo --scriptDir--
+#   echo $scriptDir
+#   echo --start_point--
+#   echo $start_point
+   echo "------"
+
 
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
@@ -44,19 +70,21 @@ fi
   echo "we remove old stuff"
   rm -rf $sourcesDir/VTK*
   rm -rf $sourcesDir/vtk*
-  rm -rf $binDir/VTK*  
-  
- cd $sourcesDir
- 
+  rm -rf $binDir/VTK*
+
+  cd $sourcesDir
+
+ echo "we download new stuff"
  if [ $OperatingSystem = "MacOS" ]
-   then	    
-    curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
-    # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
-    tar -xvf VTK-5.6.1.patchCreatis.tar.gz
-   else
-    wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+ then
+  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+  # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
+  tar -xvf VTK-5.6.1.patchCreatis.tar.gz
+ else
+  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+  tar -xzvf VTK-5.6.1.patchCreatis.tar.gz
  fi
- 
+
 if [ $buildType = "Debug" ]
 then
    debug="ON"
@@ -70,24 +98,29 @@ if [ true = true ]
 then
   libname=VTK
   dirInstall=$binDir/$libname-Bin
-  dirInstallVTK=$dirInstall
   export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
   mkdir $dirInstall
+  echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-5.6/
   cd $dirInstall
- 
+
+# See EED why we have to do this
+  if [ $OperatingSystem = "MacOS" ]
+  then
+     cmake -D  CMAKE_CXX_COMPILER:FILE=/usr/bin/g++
+  fi
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
-  cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird  CMakeCache.txt
-  
+  cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
+
   if [ $OperatingSystem = "MacOS" ]
   then
-    cmake -D BUILD_SHARE_LIBS:BOOL=ON -D VTK_USE_CARBON:BOOL=ON -D  VTK_USE_COCOA:BOOL=OFF CMakeCache.txt 
-    cmake -D  VTK_USE_TCL:BOOL=OFF                                                         CMakeCache.txt  
-    cmake -D  CMAKE_CXX_COMPILER:FILE=/usr/bin/g++                                         CMakeCache.txt    
-  fi	  
+    cmake -D BUILD_SHARE_LIBS:BOOL=ON -D VTK_USE_CARBON:BOOL=ON -D  VTK_USE_COCOA:BOOL=OFF CMakeCache.txt
+    cmake -D  VTK_USE_TCL:BOOL=OFF                                                         CMakeCache.txt
+    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
   make -j $corenumber
   make install
   cd ..
 fi
-