X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Fnetgen-4.9.13.sh;h=a4f470f86b87a39aab129faad2ef41c1c4377919;hb=260bf6b42efe9e30501c4e6e99b013da3fe34f77;hp=1e9944c77d971e4e0b3e0156c9eebc81ddc6e633;hpb=d64a019a9eab3aa74d6f432c67439c06c129591e;p=tools%2Finstall.git

diff --git a/config_files/netgen-4.9.13.sh b/config_files/netgen-4.9.13.sh
index 1e9944c..a4f470f 100755
--- a/config_files/netgen-4.9.13.sh
+++ b/config_files/netgen-4.9.13.sh
@@ -64,12 +64,6 @@ if [ -f patches/netgen-4.9.13-for-SALOME.patch ] ; then
     ( cd ${PRODUCT_SRC_DIR}; patch -p1 < netgen-4.9.13-for-SALOME.patch )
 fi
 
-# apply patch for CMake
-if [ -f patches/netgen-4.9.13-for-CMake.patch ] ; then
-    cp patches/netgen-4.9.13-for-CMake.patch ${PRODUCT_SRC_DIR}
-    ( cd ${PRODUCT_SRC_DIR}; patch -p1 < netgen-4.9.13-for-CMake.patch )
-fi
-
 # to make nglib only:
 # -SUBDIRS = libsrc ng nglib tutorials doc windows
 # +SUBDIRS = libsrc nglib #ng tutorials doc windows
@@ -89,36 +83,29 @@ install_source
 
 # build sources
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
-chmod -R 755 ${PRODUCT_SRC_DIR}
-cd ${PRODUCT_SRC_DIR} && ./build_cmake
 
-export PRODUCT_BUILD_DIR=${PRODUCT_DIR}_build
-mkdir -p ${PRODUCT_BUILD_DIR}
-cd ${PRODUCT_BUILD_DIR}
+cd ${PRODUCT_SRC_DIR}
 
-CMAKE_OPTIONS=""
 #configure
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_DIR}"
+NETGEN_CONFIGURE_OPTIONS="--with-occ=${CASROOT} --prefix=${PRODUCT_DIR}"
+NETGEN_CONFIGURE_OPTIONS="${NETGEN_CONFIGURE_OPTIONS} --with-tcl=${TCLHOME}/lib --with-tk=${TCLHOME}/lib --with-tclinclude=${TCLHOME}/include"
 if test `uname -m` = "x86_64" ; then
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING=-m64"
-    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING=-m64"
+    ./configure ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS='-O2 -m64' >> ${PRODUCT_DIR}/CONFIGURE.LOG 
+else
+    ./configure ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS=-O2 >> ${PRODUCT_DIR}/CONFIGURE.LOG 
 fi
 
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG cmake ${PRODUCT_SRC_DIR} $CMAKE_OPTIONS
-
 # compile
-cat > ${PRODUCT_DIR}/MAKE.LOG <<EOF
-used gcc=$GCC
-EOF
-check_job ${PRODUCT_DIR}/MAKE.LOG make -j4
+check_job ${PRODUCT_DIR}/MAKE.LOG make
+
 # install
 check_job ${PRODUCT_DIR}/INSTALL.LOG make install 
 
-#for directory in general gprim linalg meshing ; do
-#    cp -f ${PRODUCT_SRC_DIR}/libsrc/${directory}/*.hpp ${PRODUCT_DIR}/include
-#done
-#cp -f ${PRODUCT_SRC_DIR}/libsrc/include/mystdlib.h ${PRODUCT_SRC_DIR}/libsrc/include/mydefs.hpp ${PRODUCT_DIR}/include
-#cp -f ${PRODUCT_SRC_DIR}/libsrc/occ/occgeom.hpp ${PRODUCT_SRC_DIR}/libsrc/occ/occmeshsurf.hpp ${PRODUCT_DIR}/include
+for directory in general gprim linalg meshing ; do
+    cp -f ${PRODUCT_SRC_DIR}/libsrc/${directory}/*.hpp ${PRODUCT_DIR}/include
+done
+cp -f ${PRODUCT_SRC_DIR}/libsrc/include/mystdlib.h ${PRODUCT_SRC_DIR}/libsrc/include/mydefs.hpp ${PRODUCT_DIR}/include
+cp -f ${PRODUCT_SRC_DIR}/libsrc/occ/occgeom.hpp ${PRODUCT_SRC_DIR}/libsrc/occ/occmeshsurf.hpp ${PRODUCT_DIR}/include
 
 cd ${PRODUCT_DIR};
 
@@ -141,6 +128,58 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
+### modifing la files
+cd ${PRODUCT_DIR}/lib
+freetypedir=`printenv FREETYPEDIR`
+ftgldir=`printenv FTGLDIR`
+gl2psdir=`printenv GL2PSHOME`
+freeimagedir=`printenv FREEIMAGEDIR`
+tbbbasedir=`printenv TBBHOME`
+
+TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21'
+if test `uname -m` = "x86_64" ; then
+    export TBBMODE="intel64/$TBBKERNEL"
+else
+    export TBBMODE="ia32/$TBBKERNEL"
+fi
+
+tbbdir=${tbbbasedir}/lib/$TBBMODE
+
+	if [ -n "${freetypedir}" ] && [ -d "${freetypedir}" ] ; then
+	    sed -e "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freetypedir}/lib \3%g" \
+		-e 's%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype \3%g' libnglib.la > _libnglib.la
+	    mv -f _libnglib.la libnglib.la
+	fi
+	chmod a+x libnglib.la
+	if [ -n "${ftgldir}" ] && [ -d "${ftgldir}" ] ; then
+	    sed -e "s%\(.*\)\([[:space:]].*-L.*/ftgl-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${ftgldir}/lib \3%g" \
+		-e 's%\(.*\)\([[:space:]].*libftgl.la\)\(.*\)%\1 -lftgl \3%g' libnglib.la > _libnglib.la
+	    mv -f _libnglib.la libnglib.la
+	fi
+	chmod a+x libnglib.la
+	if [ -n "${gl2psdir}" ] && [ -d "${gl2psdir}" ] ; then
+	    sed -e "s%\(.*\)\([[:space:]].*-L.*/gl2ps-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${gl2psdir}/lib \3%g" libnglib.la > _libnglib.la
+	    mv -f _libnglib.la libnglib.la
+	fi
+	chmod a+x libnglib.la
+	if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then
+	    sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" libnglib.la > _libnglib.la
+	    mv -f _libnglib.la libnglib.la
+	fi
+	chmod a+x libnglib.la
+	if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then
+	    sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage-[0-9]\.[0-9][0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" libnglib.la > _libnglib.la
+	    mv -f _libnglib.la libnglib.la
+	fi
+	chmod a+x libnglib.la
+	if [ -n "${tbbdir}" ] && [ -d "${tbbdir}" ] ; then
+	    sed -e "s%\(.*\)\([[:space:]].*-L.*/tbb[^[:space:]]*/lib[^[:space:]]*\)\(.*\)%\1 -L${tbbdir} \3%g" libnglib.la > _libnglib.la
+	    mv -f _libnglib.la libnglib.la
+	fi
+	chmod a+x libnglib.la
+
+sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g;s%[[:space:]]-L[^[:space:]]*\(OCCT\|CAS\)[^[:space:]]*/lib\?% -L${CASROOT}/lib%g;s%[[:space:]][^[:space:]]*\(OCCT\|CAS\)[^[:space:]]*/lib/lib\?% ${CASROOT}/lib/lib%g" libnglib.la
+
 # to generate environment script for sources
 try_preinstalled
 }