X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=ctest%2Fdashboard%2Fcmakemod.sh;h=c23dfdc7d0019badb61e43192397fab503d44c72;hb=e44779bdacf6b23c4bd09580a5ef56cfe827a14f;hp=77077d4bcea3b94582da87b570a35d6bb395285f;hpb=7875890ce0a84087c9a77b17a95cf2844e1f1a40;p=creaToolsTools.git

diff --git a/ctest/dashboard/cmakemod.sh b/ctest/dashboard/cmakemod.sh
index 77077d4..c23dfdc 100644
--- a/ctest/dashboard/cmakemod.sh
+++ b/ctest/dashboard/cmakemod.sh
@@ -1,20 +1,23 @@
+currentdir=$2
 
-currentdir=$3
-
-dirInstall=$3/tmpCreaTools_INSTALL/$1
+dirInstall=$currentdir/tmpCreaTools_INSTALL/$1Bin
 
 echo dirInstall
 echo $dirInstall
 
-# needed later
-mkdir $2
+mkdir $dirInstall
+cd $dirInstall
+echo -H$currentdir/$1
+echo -B$dirInstall/
 
-cd $2
+cmake -G"Unix Makefiles" -H$currentdir/$1 -B$dirInstall/
+cmake -D --BUILD_ALL:BOOL=ON CMakeCache.txt
 
-cmake -G"Unix Makefiles" -H$currentdir/$1 -B$2 
+# 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
 
-cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall CMakeCache.txt
+# This one : only for misinstalled vtk:
+# modify VTK_DIR:PATH=, acording to your own computer
 
-#echo "only for misinstalled vtk"
-#cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall -D VTK_DIR:PATH=/usr/local/lib/vtk-5.4 CMakeCache.txt
+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
 cd ..