X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=ctest%2Fdashboard%2Fcmakemod.sh;h=97fa7514a17f6945bf884620be8895069baf3b6c;hb=06644d6bad86d71b9a06d7c2d9a5cb8601181e4c;hp=00d15e914197d8add5a6fdb083303268c237b2a1;hpb=fab968d9407978d3f28ba5e646e9a18c4a4dbf27;p=creaToolsTools.git

diff --git a/ctest/dashboard/cmakemod.sh b/ctest/dashboard/cmakemod.sh
index 00d15e9..97fa751 100644
--- a/ctest/dashboard/cmakemod.sh
+++ b/ctest/dashboard/cmakemod.sh
@@ -4,13 +4,8 @@ currentdir=$2
 VTKdir=$3
 installPrefix=$4
 dirInstall=$currentdir/tmpCreaTools_INSTALL/$1Bin
-
-if [$# = 4]
-then 
 installPrefix=$4
-else
-installPrefix="/usr/local"
-fi
+
 
 echo dirInstall
 echo $dirInstall
@@ -21,7 +16,7 @@ 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
@@ -29,5 +24,5 @@ cmake -D --BUILD_ALL:BOOL=ON 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_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=$VTKdir -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin CMAKE_INSTALL_PREFIX=$installPrefix CMakeCache.txt
+cmake -D INCLUDE_CTEST:BOOL=ON -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=/usr/lib64/vtk-5.4/ -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 ..