From eb5f952fec95cfcca236db4e85c7e929715a7295 Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Thu, 12 May 2011 07:12:57 +0000
Subject: [PATCH] Update products for Salome 6.3.0

---
 config_files/ParaView-3.10.sh               |  8 +++--
 config_files/{med-3.0.1.sh => med-3.0.2.sh} |  2 +-
 config_files/netgen-4.9.13.sh               | 39 ++++++++++++++-------
 3 files changed, 33 insertions(+), 16 deletions(-)
 rename config_files/{med-3.0.1.sh => med-3.0.2.sh} (99%)
 mode change 100755 => 100644

diff --git a/config_files/ParaView-3.10.sh b/config_files/ParaView-3.10.sh
index 776c4b5..d1a1519 100755
--- a/config_files/ParaView-3.10.sh
+++ b/config_files/ParaView-3.10.sh
@@ -188,8 +188,12 @@ CMAKE_OPTIONS=$CMAKE_OPTIONS" -DBOOST_ROOT=${BOOSTDIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessing:BOOL=OFF"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_Prism:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SLACTool:BOOL=OFF"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SierraPlugin:BOOL=OFF"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_VisTrailsPlugin:BOOL=OFF"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=OFF"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ENABLE_COPROCESSING:BOOL=OFF"
 
 ### Extra options (switch on required Paraview plug-ins)
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON"
diff --git a/config_files/med-3.0.1.sh b/config_files/med-3.0.2.sh
old mode 100755
new mode 100644
similarity index 99%
rename from config_files/med-3.0.1.sh
rename to config_files/med-3.0.2.sh
index c3d1cd4..04b9191
--- a/config_files/med-3.0.1.sh
+++ b/config_files/med-3.0.2.sh
@@ -224,7 +224,7 @@ shift
 REMOVE_SRC_TMP=$8;
 shift
 SINGLE_DIR=$9
-export PRODUCT="med-3.0.1"
+export PRODUCT="med-3.0.2"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
diff --git a/config_files/netgen-4.9.13.sh b/config_files/netgen-4.9.13.sh
index 0036fba..18ce452 100755
--- a/config_files/netgen-4.9.13.sh
+++ b/config_files/netgen-4.9.13.sh
@@ -63,6 +63,12 @@ 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
@@ -82,29 +88,36 @@ 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
 
-cd ${PRODUCT_SRC_DIR}
+export PRODUCT_BUILD_DIR=${PRODUCT_DIR}_build
+mkdir -p ${PRODUCT_BUILD_DIR}
+cd ${PRODUCT_BUILD_DIR}
 
+CMAKE_OPTIONS=""
 #configure
-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"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_DIR}"
 if test `uname -m` = "x86_64" ; then
-    ./configure ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS='-O2 -m64' >> ${PRODUCT_DIR}/CONFIGURE.LOG 
-else
-    ./configure ${NETGEN_CONFIGURE_OPTIONS} CXXFLAGS=-O2 >> ${PRODUCT_DIR}/CONFIGURE.LOG 
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_CXX_FLAGS:STRING='-O2 -m64'"
+    CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_C_FLAGS:STRING='-O2 -m64'"
 fi
 
-# compile
-check_job ${PRODUCT_DIR}/MAKE.LOG make
+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
 # 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};
 
-- 
2.39.2