X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2Fcmakemod.sh;fp=Install%2Fscripts%2Fcmakemod.sh;h=45f89f91caacc1e33b3939cc8a4df64cf42cf09b;hb=350ece6ac0f0307f45cb797b3c32eab9317a4bd0;hp=b9a0b4568cdb03f1a80b2a14fb6d06e432652a92;hpb=44399c6678eff439161aadb88215785204331a6f;p=creaToolsTools.git

diff --git a/Install/scripts/cmakemod.sh b/Install/scripts/cmakemod.sh
index b9a0b45..45f89f9 100644
--- a/Install/scripts/cmakemod.sh
+++ b/Install/scripts/cmakemod.sh
@@ -1,28 +1,18 @@
 #!/bin/sh
 
 currentdir=$2
-VTKdir=$3
-installPrefix=$4
+installPrefix=$3
 dirInstall=$currentdir/creatools_bin/$1Bin
-installPrefix=$4
-buildType=$5
-archi=$6
+buildType=$4
 
-if [ buildType = "Debug" ]
+
+if [ $buildType = "Debug" ]
 then
 debug="ON"
 else
 debug="OFF"
 fi
 
-install_lib_dir=$installPrefix/
-if [ archi = 64 ]
-then
-install_lib_dir=$installPrefix/lib64
-else
-install_lib_dir=$installPrefix/lib
-fi
-
 echo dirInstall
 echo $dirInstall
 
@@ -31,16 +21,18 @@ cd $dirInstall
 echo -H$currentdir/creatools_source/$1
 echo -B$dirInstall/
 
-##cmake -G"CodeBlocks - Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/
-cmake -G"Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/
+## 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 USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_LIBDIR:PATH=$install_lib_dir CMakeCache.txt
+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/creatools_bin/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/creatools_bin/creaBin -D BBTK_DIR:PATH=$currentdir/creatools_bin/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 ..
+
+