From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Thu, 6 Aug 2015 14:04:35 +0000 (+0200)
Subject: #2689 creaToolsTools Feature New Normal  -  Third party Linux WT configuration
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaToolsTools.git;a=commitdiff_plain;h=2d0e412e62870bb81eee1ae1107e7e2f3d6ed7a1

#2689 creaToolsTools Feature New Normal  -  Third party Linux WT configuration
---

diff --git a/Linux/installscript b/Linux/installscript
index 7bebda0..a1ff1d4 100755
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -260,13 +260,6 @@ if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then
     cd $scriptDirName
 fi
 
-# wt
-if [ `checkVal $command all 3rd 3rd-wt` == true ] ; then
-    bigDisplay "INSTALL WT"
-    source scripts/ThirdParty-install-WT.sh
-    cd $scriptDirName
-fi
-
 # itk
 if [ `checkVal $command all 3rd 3rd-itk` == true ] ; then
     bigDisplay "INSTALL $ITKVersion"
@@ -274,6 +267,12 @@ if [ `checkVal $command all 3rd 3rd-itk` == true ] ; then
     cd $scriptDirName
 fi
 
+# wt
+if [ `checkVal $command all 3rd 3rd-wt` == true ] ; then
+    bigDisplay "INSTALL WT"
+    source scripts/ThirdParty-install-WT.sh
+    cd $scriptDirName
+fi
 
 # Setup the user .bashrc correctly
 if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx 3rd-wt ` == true ] ; then
diff --git a/Linux/scripts/ThirdParty-install-WT.sh b/Linux/scripts/ThirdParty-install-WT.sh
index 2c9cf3d..9ddfaef 100644
--- a/Linux/scripts/ThirdParty-install-WT.sh
+++ b/Linux/scripts/ThirdParty-install-WT.sh
@@ -141,13 +141,14 @@ 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 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
 #  if [ $OperatingSystem = "MacOS" ]
 #  then
 #     ###
 #  fi
 
   make -j $corenumber
-  make install
+  su -c 'make install'
   cd ..
 fi