X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Install%2Fscripts%2Fcmakemod.sh;h=45f89f91caacc1e33b3939cc8a4df64cf42cf09b;hb=d76d85c106c5d0ba2299710f735b5a7e3bd94ac1;hp=4a401cde76a2cb6e7ba5bb158f92dbdc57fb879d;hpb=408ce0d93a1f7cf4e06d77e4dcc122e4a4965cc6;p=creaToolsTools.git

diff --git a/Install/scripts/cmakemod.sh b/Install/scripts/cmakemod.sh
index 4a401cd..45f89f9 100644
--- a/Install/scripts/cmakemod.sh
+++ b/Install/scripts/cmakemod.sh
@@ -1,17 +1,16 @@
 #!/bin/sh
 
 currentdir=$2
-VTKdir=$3
-installPrefix=$4
-dirInstall=$currentdir/tmpCreaTools_INSTALL/$1Bin
-installPrefix=$4
-buildType=$5
+installPrefix=$3
+dirInstall=$currentdir/creatools_bin/$1Bin
+buildType=$4
 
-if [ buildType = "Debug" ]
+
+if [ $buildType = "Debug" ]
 then
-debug = "ON"
+debug="ON"
 else
-debug = "OFF"
+debug="OFF"
 fi
 
 echo dirInstall
@@ -19,18 +18,21 @@ echo $dirInstall
 
 mkdir $dirInstall
 cd $dirInstall
-echo -H$currentdir/$1
+echo -H$currentdir/creatools_source/$1
 echo -B$dirInstall/
 
-## cmake -G"CodeBlocks - Unix Makefiles" -H$currentdir/$1 -B$dirInstall/
-cmake -G"Unix Makefiles" -H$currentdir/$1 -B$dirInstall/
-cmake -D BUILD_ALL:BOOL=ON -D USE_DEBUG_LIB:BOOL=$debug CMakeCache.txt
+## cmake -G"Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/
+cmake -G"CodeBlocks - Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/
+
+cmake -D BUILD_ALL:BOOL=ON -D INCLUDE_CTEST:BOOL=ON -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix 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
+#cmake -D INCLUDE_CTEST: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 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
+##cmake -D INCLUDE_CTEST:BOOL=ON -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=$VTKdir -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt
 cd ..
+
+