From: inv Date: Thu, 23 Dec 2010 07:53:43 +0000 (+0000) Subject: Correct path to the hdf and tcl libraries in *.cmake files X-Git-Tag: V6_2_0~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=55c05d5b052b38c8c562461efedaa8ca531bdae3;p=tools%2Finstall.git Correct path to the hdf and tcl libraries in *.cmake files --- diff --git a/config_files/ParaView-3.9.sh b/config_files/ParaView-3.9.sh index 98f3cc4..94e163f 100755 --- a/config_files/ParaView-3.9.sh +++ b/config_files/ParaView-3.9.sh @@ -212,7 +212,7 @@ check_jb tar xfz ${SOURCE_DIR}/../../SOURCES/ParaViewData-${PVVERSION}.tar.gz -C cd ${PRODUCT_DIR} -for f in `find . -name *.cmake` ; do +for f in `find . -name "*.cmake"` ; do sed -e "s%/[^\";]*/bin/moc%$QTDIR/bin/moc%g" \ -e "s%/[^\";]*/bin/uic%$QTDIR/bin/uic%g" \ -e "s%/[^\";]*/bin/rcc%$QTDIR/bin/rcc%g" \ @@ -221,6 +221,10 @@ sed -e "s%/[^\";]*/bin/moc%$QTDIR/bin/moc%g" \ -e "s%/[^\";]*/lib64/libQt%$QTDIR/lib64/libQt%g" \ -e "s%/[^\";]*/lib/python\([0-9].[0-9]\)/config/libpython%$PYTHONHOME/lib/python\1/config/libpython%g" \ -e "s%/[^\";]*/include/python\([0-9].[0-9]\)%$PYTHONHOME/include/python\1%g" \ + -e "s%/[^\";]*/tcltk[^/]*/include%${TCLHOME}/include%g" \ + -e "s%/[^\";]*/tcltk[^/]*/lib%${TCLHOME}/lib%g" \ + -e "s%/[^\";]*/lib/libhdf5.so%${HDF5HOME}/lib/libhdf5.so%g" \ + -e "s%/[^\";]*/lib64/libhdf5.so%${HDF5HOME}/lib64/libhdf5.so%g" \ ${f} > ${f}.new mv -f ${f}.new ${f} done