X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaToolsTools.git;a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-WT.sh;h=ea5fc673fac66378e5a5371cdd54c86f6b75591d;hp=9ddfaefad8ff82b2ce635c04efa083ee3d9f2591;hb=1195cf5621f8d7a36af22f32633d443e8d29221d;hpb=86c5583aab988649d3987a15fcd17da4739baff3

diff --git a/Linux/scripts/ThirdParty-install-WT.sh b/Linux/scripts/ThirdParty-install-WT.sh
index 9ddfaef..ea5fc67 100644
--- a/Linux/scripts/ThirdParty-install-WT.sh
+++ b/Linux/scripts/ThirdParty-install-WT.sh
@@ -99,18 +99,21 @@ fi
   cd $sourcesDir
 
  echo "we download new stuff"
- if [ $OperatingSystem = "MacOS" ]
- then
-
-  curl -O http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-3.3.4.tar.gz
-  tar -xvzf wt-3.3.4.tar.gz
-  # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
- else
-  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-3.3.4.tar.gz
-  echo tar -xvzf wt-3.3.4.tar.gz
-  pwd
-  tar -xvzf wt-3.3.4.tar.gz
- fi
+ 
+##  if [ $OperatingSystem = "MacOS" ]
+##  then
+## #  curl -O http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-3.3.4.tar.gz
+## #  tar -xvzf wt-3.3.4.tar.gz
+##   curl -O http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-4.0.4-rc1.tar.gz
+##   tar -xvzf wt-4.0.4-rc1.tar.gz
+##   # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
+##  else
+## #  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-3.3.4.tar.gz
+## #  tar -xvzf wt-3.3.4.tar.gz
+## fi
+
+  wget http://www.creatis.insa-lyon.fr/~davila/creatools_back_site/crea_ThirdParty_Libraries/source/wt-4.0.4-rc1.tar.gz
+  tar -xvzf wt-4.0.4-rc1.tar.gz
 
 
 #if [ $buildType = "Debug" ]
@@ -124,13 +127,14 @@ fi
 #if [ true = false ]
 if [ true = true ]
 then
-  libname=wt-3.3.4
+##  libname=wt-3.3.4
+  libname=wt-4.0.4-rc1
   dirInstall=$binDir/$libname-Bin
-##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
-  export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
+##  export WT_DIR=$installPrefixThird/lib/wt-3.3.4/
+  export WT_DIR=$installPrefixThird/lib/$libname
 
   mkdir -p $dirInstall
-  echo "we prepare directories dirInstall " $dirInstall  " WT_DIR " $installPrefixThird/lib/wt-3.3.4/
+  echo "we prepare directories dirInstall " $dirInstall  " WT_DIR " $installPrefixThird/lib/$libname/
   cd $dirInstall
 
 # See EED why we have to do this
@@ -141,8 +145,8 @@ then
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   cmake -D CMAKE_BUILD_TYPE:STRING=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
-  cmake -D LIB_INSTALL_DIR:PATH=lib/$libname -D ENABLE_EXT:BOOL=true ENABLE_MYSQL:BOOL=false CMakeCache.txt
-  cmake -D BUILD_TESTS:BOOL=false CMakeCache.txt
+  cmake -D LIB_INSTALL_DIR:PATH=lib/$libname -D ENABLE_EXT:BOOL=ON ENABLE_MYSQL:BOOL=OFF CMakeCache.txt
+  cmake -D BUILD_TESTS:BOOL=OFF CMakeCache.txt
 #  if [ $OperatingSystem = "MacOS" ]
 #  then
 #     ###
@@ -150,5 +154,6 @@ then
 
   make -j $corenumber
   su -c 'make install'
+  sudo make install
   cd ..
 fi