From: Leonardo Florez-Valencia <florez-l@javeriana.edu.co>
Date: Sat, 7 Oct 2017 02:46:11 +0000 (-0500)
Subject: ...
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d10c592abd8bda2b8ca9dfdfad215e6d10d996ec;p=cpPlugins.git

...
---

diff --git a/config/install_ivq.sh b/config/install_ivq.sh
index 81b9e00..8d1422b 100755
--- a/config/install_ivq.sh
+++ b/config/install_ivq.sh
@@ -24,6 +24,10 @@ while [[ "$#" -gt 1 ]]; do
         prefix="$2"
         shift
         ;;
+        -suffix)
+        suffix="$2"
+        shift
+        ;;
         -build_dir)
         build_dir="$2"
         shift
@@ -57,6 +61,9 @@ fi
 if [ -z "$build_dir" ] ; then
     build_dir="$HOME/.tmp"
 fi
+if [ ! -z "$suffix" ] ; then
+    qt_suffix="-qtlibinfix $suffix"
+fi
 curr_dir=`pwd`
 
 ## -- Configure, build and install Qt5
@@ -75,19 +82,20 @@ $qt/configure \
     -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport \
     -skip qtspeech -skip qtsvg -skip qttranslations -skip qtvirtualkeyboard \
     -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets \
-    -skip qtwebview -skip qtxmlpatterns \
-    -qtlibinfix _cpPlugins
-make -j$cores -k
-make -j -k install
+    -skip qtwebview -skip qtxmlpatterns $qt_suffix
+make -s -j$cores -k
+make -s -j -k install
 
 ## -- Configure, build and install CMake
 mkdir -p $build_dir/cmake
 cd $build_dir/cmake
 $cmake/bootstrap --parallel=$cores --prefix=$prefix --no-qt-gui
-make -j$cores -k
-make -j -k install
+make -s -j$cores -k
+make -s -j -k install
 
 ## -- Configure, build and install VTK
+cd $vtk
+patch -s -p1 < $curr_dir/vtk.patch
 mkdir -p $build_dir/vtk
 cd $build_dir/vtk
 $prefix/bin/cmake \
@@ -103,12 +111,12 @@ $prefix/bin/cmake \
     -DQt5_DIR:PATH=$prefix/lib/cmake/Qt5 \
     -DQT_QMAKE_EXECUTABLE:PATH=$prefix/bin/qmake \
     -DModule_vtkGUISupportQtOpenGL:BOOL=ON \
-    -DCMAKE_DEBUG_POSTFIX:STRING="_cpPlugins" \
-    -DCMAKE_RELEASE_POSTFIX:STRING="_cpPlugins" \
+    -DCMAKE_DEBUG_POSTFIX:STRING=$suffix \
+    -DCMAKE_RELEASE_POSTFIX:STRING=$suffix \
     -DCMAKE_MACOSX_RPATH:BOOL=ON \
     $vtk
-make -j$cores -k
-make -j -k install
+make -s -j$cores -k
+make -s -j -k install
 
 ## -- Configure, build and install VTK
 mkdir -p $build_dir/itk
@@ -123,12 +131,12 @@ $prefix/bin/cmake \
     -DBUILD_TESTING:BOOL=OFF \
     -DModule_ITKReview:BOOL=ON \
     -DModule_ITKVtkGlue:BOOL=ON \
-    -DCMAKE_DEBUG_POSTFIX:STRING="_cpPlugins" \
-    -DCMAKE_RELEASE_POSTFIX:STRING="_cpPlugins" \
+    -DCMAKE_DEBUG_POSTFIX:STRING=$suffix \
+    -DCMAKE_RELEASE_POSTFIX:STRING=$suffix \
     -DCMAKE_MACOSX_RPATH:BOOL=ON \
     $itk
-make -j$cores -k
-make -j -k install
+make -s -j$cores -k
+make -s -j -k install
 
 ## -- End
 cd $curr_dir