X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Install%2Fscripts%2Fcmakemod.sh;h=4f885de40d7b714d0426e2b699ef31222fd42072;hb=32be93ef6298b8294dc55e1b6207450d6d6399a1;hp=89c994cd9a5dde04dfeddcfee3b3743895adcf0e;hpb=c9a43f62aafb660406c824bdec89c16ddeafa23a;p=creaToolsTools.git

diff --git a/Install/scripts/cmakemod.sh b/Install/scripts/cmakemod.sh
index 89c994c..4f885de 100644
--- a/Install/scripts/cmakemod.sh
+++ b/Install/scripts/cmakemod.sh
@@ -6,7 +6,8 @@ installPrefix=$4
 dirInstall=$currentdir/creatools_bin/$1Bin
 installPrefix=$4
 buildType=$5
-echo $debug
+archi=$6
+
 if [ buildType = "Debug" ]
 then
 debug="ON"
@@ -14,6 +15,14 @@ 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
 
@@ -24,13 +33,13 @@ echo -B$dirInstall/
 
 ## cmake -G"CodeBlocks - Unix Makefiles" -H$currentdir/$1 -B$dirInstall/
 cmake -G"Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/
-cmake -D BUILD_ALL:BOOL=ON -D USE_DEBUG_LIB:BOOL=$buildType CMakeCache.txt
+cmake -D BUILD_ALL:BOOL=ON -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_LIBDIR:PATH=$install_lib_dir 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 -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall -D crea_DIR:PATH=$currentdir/creatools_source/creaBin 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_source/creaBin -D BBTK_DIR:PATH=$currentdir/creatools_source/bbtkBin -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt
 cd ..