X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=ctest%2Fdashboard%2Fcmakemod.sh;h=fcd42f13945ff7be92859027db222060aae41483;hb=863ebc3e0db57c7bd4a42a949b41cab325829e7d;hp=5622f0ce1572d4ffb8f0155cf9c99aaf15078c00;hpb=d76552fe1d448d38571766051594d531c36afc96;p=creaToolsTools.git

diff --git a/ctest/dashboard/cmakemod.sh b/ctest/dashboard/cmakemod.sh
index 5622f0c..fcd42f1 100644
--- a/ctest/dashboard/cmakemod.sh
+++ b/ctest/dashboard/cmakemod.sh
@@ -1,9 +1,27 @@
-currentdir=`pwd`
-dirInstall=$currentdir/tmpCreaTools_INSTALL/$1
+currentdir=$2
 
-mkdir $2
-cd $2
-cmake -G"Unix Makefiles" -H$currentdir$1 -B$currentdir$2
-cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall CMakeCache.txt
-cd ..
+dirInstall=$currentdir/tmpCreaTools_INSTALL/$1Bin
+
+echo dirInstall
+echo $dirInstall
+
+mkdir $dirInstall
+cd $dirInstall
+echo -H$currentdir/$1
+echo -B$dirInstall/
+
+cmake -G"Unix Makefiles" -H$currentdir/$1 -B$dirInstall/
+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
+
+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 ..