From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Sat, 9 Oct 2010 19:37:02 +0000 (+0000)
Subject: install in the right lib (lib / lib64)
X-Git-Tag: Creatools2-0-3.creaToolsTools2-0-3.17Feb2011~129
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ecfc908fa2e8e4a387a1bcca7f25fbc5c2a2bf87;p=creaToolsTools.git

install in the right lib (lib / lib64)
---

diff --git a/Install/creatools.sh_TEMPLATE b/Install/creatools.sh_TEMPLATE
index 2ca6a5e..8e036f2 100644
--- a/Install/creatools.sh_TEMPLATE
+++ b/Install/creatools.sh_TEMPLATE
@@ -4,8 +4,9 @@ vtkDir=<youtr vtk dir> ex : /usr/lib64/vtk-5.4/ or /usr/lib/vtk-5.4/, ...
 cvsUser=<USER>
 docGeneration=<OFF|ON> let it to OFF!
 buildType=<Release|Debug>
+archi=<32|64> (processor bits number)
 
 #sudo pwd
 cd scripts
-sh All.sh $creatoolsGeneration $docGeneration $cvsUser $vtkDir $installPrefix $buildType
+sh All.sh $creatoolsGeneration $docGeneration $cvsUser $vtkDir $installPrefix $buildType $archi
 cd ..
diff --git a/Install/scripts/cmakemod.sh b/Install/scripts/cmakemod.sh
index 36b108b..1f74215 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,13 @@ else
 debug="OFF"
 fi
 
+install_lib_dir=$installPrefix/
+if [ archi = 64 ]
+install_lib_dir=$installPrefix/lib64
+else
+install_lib_dir=$installPrefix/lib
+fi
+
 echo dirInstall
 echo $dirInstall
 
@@ -22,10 +30,9 @@ 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"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