What did I commit ?!?

[creaToolsTools.git] / Install / scripts / cmakemod.sh

diff --git a/Install/scripts/cmakemod.sh b/Install/scripts/cmakemod.sh
index 36b108bb6ca63780666d14c61eddefad1b517e0d..4f885de40d7b714d0426e2b699ef31222fd42072 100644 (file)
--- 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
 
@@ -22,16 +31,15 @@ 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
+#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 ..