X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=ctest%2Fdashboard%2Fcmakemod.sh;h=2f80981a02bd981595a6d9250d6e6801a407b41c;hb=5f3676d2d219c77843f8a7a2c3bb1c9cbfbcde26;hp=fcd42f13945ff7be92859027db222060aae41483;hpb=162fc284fc5a18bb989721f383cedbdd402ff497;p=creaToolsTools.git

diff --git a/ctest/dashboard/cmakemod.sh b/ctest/dashboard/cmakemod.sh
index fcd42f1..2f80981 100644
--- a/ctest/dashboard/cmakemod.sh
+++ b/ctest/dashboard/cmakemod.sh
@@ -1,6 +1,11 @@
-currentdir=$2
+#!/bin/sh
 
+currentdir=$2
+VTKdir=$3
+installPrefix=$4
 dirInstall=$currentdir/tmpCreaTools_INSTALL/$1Bin
+installPrefix=$4
+
 
 echo dirInstall
 echo $dirInstall
@@ -11,17 +16,13 @@ echo -H$currentdir/$1
 echo -B$dirInstall/
 
 cmake -G"Unix Makefiles" -H$currentdir/$1 -B$dirInstall/
-cmake -D --BUILD_ALL:BOOL=ON                           CMakeCache.txt
+cmake -D BUILD_ALL:BOOL=ON CMakeCache.txt
 
 # the following line is the right one!
 #cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
 
-# This one : only for misinstalled vtk
-#cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$currentdir/tmpCreaTools_INSTALL/$1 -D VTK_DIR:PATH=/usr/local/lib/vtk-5.4 -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
-
-echo "in cmakemod crea_DIR:PATH $currentdir/tmpCreaTools_INSTALL/creaBin"
-
-#cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$currentdir/tmpCreaTools_INSTALL/$1 -D BBTK_USE_QT:BOOL=OFF -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=/usr/local/lib/vtk-5.4 -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
+# This one : only for misinstalled vtk:
+# modify VTK_DIR:PATH=, acording to your own computer
 
-cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$currentdir/tmpCreaTools_INSTALL/$1 -D BBTK_USE_QT:BOOL=OFF -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=/usr/local/lib/vtk-5.4 -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin CMakeCache.txt
+cmake -D INCLUDE_CTEST:BOOL=ON -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=$VTKdir -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt
 cd ..