]> SALOME platform Git repositories - tools/install.git/blobdiff - config_files/VTK-4.2.6.sh
Salome HOME
Improve INSTALL wizard: move all patch files to the separate directory
[tools/install.git] / config_files / VTK-4.2.6.sh
index 10e3140d6d1dcc8700ba0d08480573d746ed81b8..8cf63d25fd2859830685de7acf22d2d12abf0969 100755 (executable)
@@ -66,30 +66,29 @@ source ${INSTALL_WORK}/$SHRC
 makedir ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/cmake-1.6.6.tar.gz -C ${INSTALL_WORK}
+check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.6.tar.gz -C ${INSTALL_WORK}
 
+# apply patches for 64-bit platforms
 if test `uname -m` = "x86_64" ; then
-cp cmake-1.6.6.patch ${INSTALL_WORK}/cmake-1.6.6 
-cd ${INSTALL_WORK}/cmake-1.6.6 
-patch -p 1 -i cmake-1.6.6.patch
-else
-cd ${INSTALL_WORK}/cmake-1.6.6 
+    if [ -f patches/cmake-1.6.6-lib64.patch ] ; then
+       cp patches/cmake-1.6.6-lib64.patch ${INSTALL_WORK}/cmake-1.6.6 
+       ( cd ${INSTALL_WORK}/cmake-1.6.6 ; patch -p1 < cmake-1.6.6-lib64.patch )
+    fi
+    if [ -f patches/vtk-4.2.6-lib64.patch ] ; then
+       cp patches/vtk-4.2.6-lib64.patch ${PRODUCT_WORK}
+       ( cd ${PRODUCT_WORK} ; patch -p1 < vtk-4.2.6-lib64.patch )
+    fi
 fi
 
+cd ${INSTALL_WORK}/cmake-1.6.6 
+
 check_job ${PRODUCT_DIR}/CONFIGUREcmake.LOG ./configure
 cat >> ${PRODUCT_DIR}/MAKEcmake.LOG <<EOF
 used gcc=$GCC
 EOF
 check_job ${PRODUCT_DIR}/MAKEcmake.LOG make
 
-check_jb tar xfz ${SOURCE_DIR}/VTK-4.2.6.tar.gz -C ${INSTALL_WORK}
-
-if test `uname -m` = "x86_64" ; then
-cp ${SOURCE_DIR}/../../config_files/vtk-4.2.6.patch  ${PRODUCT_WORK}
-cd ${PRODUCT_WORK} 
-patch -p 1 -i vtk-4.2.6.patch
-else
 cd ${PRODUCT_WORK}
-fi
 
 # apply a small patch for VTK (needed for gcc-3.4)
 sed -e "s%seekg(self->GetFile()->tellg()%seekg(static_cast<long>(self->GetFile()->tellg())%g" IO/vtkBMPReader.cxx > IO/vtkBMPReader.cxx.orig