Back off netgen building to make procedure

diff --git a/config_files/netgen-4.9.13.sh b/config_files/netgen-4.9.13.sh
index 1e9944c77d971e4e0b3e0156c9eebc81ddc6e633..25ea9d5a6b5da9b8cb2bac55f53b1e947deda825 100755 (executable)
--- 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};